Add a label to point to the lacking macro name definition #127557
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @compiler-errors. Use |
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Jul 25, 2024
| @@ -1439,7 +1439,11 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { | |||
| ); | |||
|
|
|||
| if macro_kind == MacroKind::Bang && ident.name == sym::macro_rules { | |||
| err.subdiagnostic(MaybeMissingMacroRulesName { span: ident.span }); | |||
| let primary_span = ident.span; | |||
| let label_span = primary_span.with_hi(primary_span.hi() + BytePos(1)).shrink_to_hi(); | |||
There was a problem hiding this comment.
Manual manipulation of spans can cause issues in situations where we recover in the lexer. I don't think this diagnostic would look a lot worse if we just used primary_span.shrink_to_hi().
Alternatively, find a more "pure" way to express this span (or a similar one) without using bytepos.
There was a problem hiding this comment.
if we just used primary_span.shrink_to_hi()
This is also looks good to me. And it is more consistent between macro_rules! {} and macro_rules!{}, which will always point to the !
Alternatively, find a more "pure" way to express this span (or a similar one) without using bytepos.
I currently have few time to try this.
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
@rustbot review |
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Jul 26, 2024
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 26, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#126575 (Make it crystal clear what lint `type_alias_bounds` actually signifies) - rust-lang#127017 (Extend rules of dead code analysis for impls for adts to impls for types refer to adts) - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake) - rust-lang#127557 (Add a label to point to the lacking macro name definition) - rust-lang#127989 (Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `run-make` tests to rmake) - rust-lang#128099 (migrate tests/run-make/extern-flag-disambiguates to rmake) - rust-lang#128170 (Make Clone::clone a lang item) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 26, 2024
Rollup merge of rust-lang#127557 - linyihai:issue-126694, r=compiler-errors Add a label to point to the lacking macro name definition Fixes rust-lang#126694, but adopts the suggestion from rust-lang#118295 ``` --> src/main.rs:1:14 | 1 | macro_rules! { | ^ put a macro name here ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #126694, but adopts the suggestion from #118295