Give better error for macro_rules name
#89257
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
added
A-diagnostics
rust-highfive
added
the
S-waiting-on-review
camelid
reviewed
Sep 26, 2021
Comment on lines
1539
to
1541
| /// The first bool is whether it's a macro_rules item. | ||
| /// The second is whether the `!` after `macro_rules` is present | ||
| fn is_macro_rules_item(&mut self) -> (bool, bool) { |
There was a problem hiding this comment.
nit: Seems like this code might be clearer if the return type were a struct with two boolean fields? E.g.:
struct IsMacroRulesItem {
is_macro_rules: bool,
has_bang_after_macro_rules: bool,
}
There was a problem hiding this comment.
Or return Option<IsMacroRulesItem> with struct IsMacroRulesItem { has_bang: bool }
There was a problem hiding this comment.
Went with
enum IsMacroRulesItem {
Yes { has_bang: bool },
No,
}we could bikeshed this forever, but I think this is pritty clear
estebank
reviewed
Sep 26, 2021
| /// The second is whether the `!` after `macro_rules` is present | ||
| fn is_macro_rules_item(&mut self) -> (bool, bool) { | ||
| if self.check_keyword(kw::MacroRules) { | ||
| let macro_rules_span = self.look_ahead(0, |t| t.span); |
There was a problem hiding this comment.
Isn't this equivalent to self.token.span?
There was a problem hiding this comment.
Yep, didn't realise you could do that
estebank
approved these changes
Sep 26, 2021
aDotInTheVoid
force-pushed
the
macro-error-2
branch
from
1ffff6f
to
729ff2d
Compare
|
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author |
apiraino
added
the
T-compiler
|
@bors r=estebank |
|
📌 Commit 729ff2d has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Oct 22, 2021
…bank Give better error for `macro_rules name` follow up to rust-lang#89221 r? `@estebank` `@rustbot` modify labels: +A-diagnostics +A-parser
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 22, 2021
Rollup of 14 pull requests Successful merges: - rust-lang#87537 (Clarify undefined behaviour in binary heap, btree and hashset docs) - rust-lang#88624 (Stabilize feature `saturating_div` for rust 1.58.0) - rust-lang#89257 (Give better error for `macro_rules name`) - rust-lang#89665 (Ensure that pushing empty path works as before on verbatim paths) - rust-lang#89895 (Don't mark for loop iter expression as desugared) - rust-lang#89922 (Update E0637 description to mention `&` w/o an explicit lifetime name) - rust-lang#89944 (Change `Duration::[try_]from_secs_{f32, f64}` underflow error) - rust-lang#89991 (rustc_ast: Turn `MutVisitor::token_visiting_enabled` into a constant) - rust-lang#90028 (Reject closures in patterns) - rust-lang#90069 (Fix const qualification when executed after promotion) - rust-lang#90078 (Add a regression test for issue-83479) - rust-lang#90114 (Add some tests for const_generics_defaults) - rust-lang#90115 (Add test for issue rust-lang#78561) - rust-lang#90129 (triagebot: Treat `I-*nominated` like `I-nominated`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
follow up to #89221
r? @estebank
@rustbot modify labels: +A-diagnostics +A-parser