Skip to content

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Nov 7, 2025

This pulls in https://github.com/rust-analyzer/ungrammar, moving maintenance into the main repo.

matklad and others added 30 commits July 31, 2020 23:27
Typo fix on grammar documentation
I assumer that's why there were already parentheses around the `':' Type`?
10: Allow type aliases in extern blocks r=jonas-schievink a=jonas-schievink

This is for the unstable feature rust-lang/rust#43467, which rustc uses internally

Co-authored-by: Jonas Schievink <[email protected]>
11: Allow both const & async modifiers
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>
12: Fix .gitignore
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>
ChayimFriedman2 and others added 14 commits February 24, 2022 14:20
48: Revert the visibility removal of macro_rules visibility (rust-lang#46) r=Veykril a=ChayimFriedman2

As discussed in rust-analyzer/ungrammar#46 (comment).

Co-authored-by: Chayim Refael Friedman <[email protected]>
The supported patterns are already valid as expressions, except the rest pattern (`..`) and the wildcard pattern (`_`).
47: Support destructuring assignments (RFC 2909) r=Veykril a=ChayimFriedman2

The supported patterns are already valid as expressions, except the rest pattern (`..`) and the wildcard pattern (`_`).

(We really should separate `rust.ungram` into the rust-analyzer repository, it blocks every syntax change).

Co-authored-by: Chayim Refael Friedman <[email protected]>
50: Include `Self` specifically in NameRef r=Veykril a=Veykril

`Self` is a keyword, so we'll treat it as such
bors r+

Co-authored-by: Lukas Wirth <[email protected]>
Update ungrammar.ungram with proper labeled rule
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 7, 2025
@rustbot

This comment was marked as resolved.

@rustbot rustbot added has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 7, 2025
@Veykril Veykril force-pushed the push-zzrzusnvwpzp branch 2 times, most recently from df2e867 to 9c70e9d Compare November 8, 2025 10:27
@Veykril Veykril enabled auto-merge November 8, 2025 10:40
@Veykril Veykril added this pull request to the merge queue Nov 8, 2025
Merged via the queue into rust-lang:master with commit ed2ae23 Nov 8, 2025
15 checks passed
@Veykril Veykril deleted the push-zzrzusnvwpzp branch November 8, 2025 10:58
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 8, 2025
@lnicola lnicola changed the title Merge ungrammar into rust-analyzer internal: Merge ungrammar into rust-analyzer Nov 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.