Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add note when matching token with nonterminal #108711

Merged
merged 1 commit into from
Mar 11, 2023
Merged

Add note when matching token with nonterminal #108711

merged 1 commit into from
Mar 11, 2023

Conversation

Noratrieb
Copy link
Member

The current error message is really confusing. The implementation is slightly hacky, but not that much more hacky than all this nonterminal stuff..

r? @petrochenkov

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 3, 2023
petrochenkov
petrochenkov reviewed Mar 6, 2023
View reviewed changes
compiler/rustc_expand/src/mbe/diagnostics.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/mbe/diagnostics.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/mbe/diagnostics.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2023
@Noratrieb
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2023
petrochenkov
petrochenkov reviewed Mar 9, 2023
View reviewed changes
compiler/rustc_expand/src/mbe/diagnostics.rs Outdated Show resolved Hide resolved
compiler/rustc_ast/src/token.rs Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

r=me after addressing nits
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2023
@Noratrieb
Add note when matching token with nonterminal
3dee463 
The current error message is _really_ confusing.
@Noratrieb
Copy link
Member Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 10, 2023

📌 Commit 3dee463 has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#108711 - Nilstrieb:nt-note, r=petrochenkov
34edc59 
Add note when matching token with nonterminal

The current error message is _really_ confusing. The implementation is slightly hacky, but not that much more hacky than all this nonterminal stuff..

r? `@petrochenkov`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 11, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 11, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2023
@bors
Auto merge of rust-lang#109015 - matthiaskrgr:rollup-xu2s31g, r=matth…
67e1681 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#106276 (Fix `vec_deque::Drain` FIXME)
 - rust-lang#107629 (rustdoc: sort deprecated items lower in search)
 - rust-lang#108711 (Add note when matching token with nonterminal)
 - rust-lang#108757 (rustdoc: Migrate `document_item_info` to Askama)
 - rust-lang#108784 (rustdoc: Migrate sidebar rendering to Askama)
 - rust-lang#108927 (Move __thread_local_inner to sys)
 - rust-lang#108949 (Honor current target when checking conditional compilation values)
 - rust-lang#108950 (Directly construct Inherited in typeck.)
 - rust-lang#108988 (rustdoc: Don't crash on `crate` references in blocks)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ef84194 into rust-lang:master Mar 11, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@fmease fmease fmease left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Noratrieb @petrochenkov @bors @fmease @rustbot