-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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.
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
ast: Mac
/Macro
-> MacCall
#69589
ast: Mac
/Macro
-> MacCall
#69589
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=me if you like
@bors r=Centril |
📌 Commit 54fd5de320bff1b5c1fcfac3925ff6744fdbf139 has been approved by |
☔ The latest upstream changes (presumably #69592) made this pull request unmergeable. Please resolve the merge conflicts. |
@bors r=Centril |
📌 Commit ba54cf381eb6bb4814e23c3f751cc86c5b0a28f1 has been approved by |
☔ The latest upstream changes (presumably #69606) made this pull request unmergeable. Please resolve the merge conflicts. |
@bors r=Centril |
📌 Commit 8f0cedc15385cb155c6fce1057560b5c0480ad9a has been approved by |
☔ The latest upstream changes (presumably #69506) made this pull request unmergeable. Please resolve the merge conflicts. |
@bors r=Centril |
📌 Commit 27becb2 has been approved by |
Failed in #69795 (comment) due to toolstate week, @bors r- |
@bors r=Centril |
📌 Commit e809e02 has been approved by |
Rollup of 8 pull requests Successful merges: - #68746 (Make macro metavars respect (non-)hygiene) - #69189 (Erase regions in writeback) - #69402 (Extend search) - #69403 (Implement `Copy` for `IoSlice`) - #69460 (Move some `build-pass` tests to `check-pass`) - #69802 (fix more clippy findings) - #69809 (remove lifetimes that can be elided (clippy::needless_lifetimes)) - #69949 (triagebot.toml: add ping aliases) Failed merges: - #69589 (ast: `Mac`/`Macro` -> `MacCall`) r? @ghost
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
Rollup of 8 pull requests Successful merges: - #69528 (Add undo_leak to reset RefCell borrow state) - #69589 (ast: `Mac`/`Macro` -> `MacCall`) - #69661 (Implement From<&mut str> for String) - #69988 (rustc_metadata: Remove `rmeta::MacroDef`) - #70006 (resolve: Fix two issues in fresh binding disambiguation) - #70011 (def_collector: Fully visit async functions) - #70013 (Return feature gate as a `Symbol` ) - #70018 (Fix "since" field for `Once::is_complete`'s `#[stable]` attribute) Failed merges: r? @ghost
rustup rust-lang/rust#69589 changelog: none
Changes: ```` rustup rust-lang#69738 rustup rust-lang#68944 Make use of `or_patterns` feature rustup rust-lang#69589 Rustup to rust-lang#69076 Don't convert Path to lossy str Use `into_path` Use pattern matching instead of manually checking condition Fix typo Remove git2 dependency. Document that wildcard_imports doesn't warn about `use ...::prelude::*;` Change changelog formatting Update changelog_update doc to reflect the actual ordering of the changelog Update CHANGELOG.md ```` Fixes rust-lang#70007
submodules: update clippy from 8485d40 to d556bb7 Changes: ```` rustup #68944 rustup #69589 Rustup to #69076 Don't convert Path to lossy str Use `into_path` Use pattern matching instead of manually checking condition Fix typo Remove git2 dependency. Document that wildcard_imports doesn't warn about `use ...::prelude::*;` Change changelog formatting Update changelog_update doc to reflect the actual ordering of the changelog Update CHANGELOG.md ```` Fixes #70007
Changes: ```` rustup rust-lang/rust#69738 rustup rust-lang/rust#68944 Make use of `or_patterns` feature rustup rust-lang/rust#69589 Rustup to rust-lang/rust#69076 Don't convert Path to lossy str Use `into_path` Use pattern matching instead of manually checking condition Fix typo Remove git2 dependency. Document that wildcard_imports doesn't warn about `use ...::prelude::*;` Change changelog formatting Update changelog_update doc to reflect the actual ordering of the changelog Update CHANGELOG.md ```` Fixes #70007
rustc_ast: Do not panic by default when visiting macro calls Panicking by default made sense when we didn't have HIR or MIR and everything worked on AST, but now all AST visitors run early and majority of them have to deal with macro calls, often by ignoring them. The second commit renames `visit_mac` to `visit_mac_call`, the corresponding structures were renamed earlier in rust-lang#69589.
rustc_ast: Do not panic by default when visiting macro calls Panicking by default made sense when we didn't have HIR or MIR and everything worked on AST, but now all AST visitors run early and majority of them have to deal with macro calls, often by ignoring them. The second commit renames `visit_mac` to `visit_mac_call`, the corresponding structures were renamed earlier in rust-lang/rust#69589.
It's now obvious that these refer to macro calls rather than to macro definitions.
It's also a single name instead of two different names in different places.
rustc_expand
usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls.cc #63586 (comment)
r? @eddyb