-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
libsyntax: Rename Mark
into ExpnId
#62705
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
f4ccc29
to
5b656b4
Compare
r? @matthewjasper |
@bors r+ |
📌 Commit 5b656b456fef4690c07378728ef1b5449b981c72 has been approved by |
☔ The latest upstream changes (presumably #62684) made this pull request unmergeable. Please resolve the merge conflicts. |
5b656b4
to
8f30d26
Compare
@bors r=matthewjasper |
📌 Commit 8f30d26 has been approved by |
libsyntax: Rename `Mark` into `ExpnId` "`Mark`" is an ID that identifies both a macro invocation (`foo!()`), and expansion process, and expansion result of that macro invocation. The problem is that it's pretty hard to infer that from its name. This PR renames it into `ExpnId` reflecting its meaning in most contexts. (The contexts where it's meaning is closer to "macro invocation ID" are rarer.) I've kept "mark" in the names of functions that add or remove marks to/from syntactic contexts, those marks are not just expansion IDs, but something more complex.
☀️ Test successful - checks-azure |
Fix breakage due to rust-lang/rust#62705 Also rename `OUTER_EXPN_INFO` to `OUTER_EXPN_EXPN_INFO` to match new function names. changelog: none
Changes: ```` Fix breakage due to rust-lang#60913 Fix breakage due to rust-lang#62705 rustup rust-lang#62679 Update pulldown-cmark to 0.5.3 rustup rust-lang#62764 Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` ````
Changes: ```` update test stderr, not sure which rustc pull request caused this. rustup rust-lang#62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to rust-lang#60913 Fix breakage due to rust-lang#62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup rust-lang#62679 Update pulldown-cmark to 0.5.3 rustup rust-lang#62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ````
submodules: update clippy from 164310d to f8e04ff Changes: ```` update test stderr, not sure which rustc pull request caused this. rustup #62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to #60913 Fix breakage due to #62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup #62679 Update pulldown-cmark to 0.5.3 rustup #62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ```` fixes clippy toolstate r? @Manishearth
Changes: ```` ci: temporarily disable rustfmt checks/tetss since it's broken for nightly rustup rust-lang#62964 Bump version of clippy_dummy update test stderr, not sure which rustc pull request caused this. rustup rust-lang#62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to rust-lang#60913 Fix breakage due to rust-lang#62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup rust-lang#62679 Update pulldown-cmark to 0.5.3 rustup rust-lang#62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ````
submodules: update clippy from 164310d to dc69a5c Changes: ```` ci: temporarily disable rustfmt checks/tetss since it's broken for nightly rustup #62964 Bump version of clippy_dummy update test stderr, not sure which rustc pull request caused this. rustup #62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to #60913 Fix breakage due to #62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup #62679 Update pulldown-cmark to 0.5.3 rustup #62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ```` fixes clippy toolstate r? @Manishearth
Changes: ```` ci: temporarily disable rustfmt checks/tetss since it's broken for nightly rustup rust-lang/rust#62964 Bump version of clippy_dummy update test stderr, not sure which rustc pull request caused this. rustup rust-lang/rust#62859 Fix tests for edition 2018 compatibility Revert "Revert global fmt config and use `rustfmt::skip`" Fix breakage due to rust-lang/rust#60913 Fix breakage due to rust-lang/rust#62705 Revert global fmt config and use `rustfmt::skip` Fix fmt rustup rust-lang/rust#62679 Update pulldown-cmark to 0.5.3 rustup rust-lang/rust#62764 Add test Format code Decrease maximum length for stderr files Improved imports Fix "unkown clippy lint" error in UI test. Corrections for PR review. Implement lint for inherent to_string() method. UI Test Cleanup: Extract match_ref_pats tests Update UI tests Allow no_effect lint Remove comment cargo fmt UI Test Cleanup: Split up checked_unwrap tests Removed lintining on never type. UI Test Cleanup: Split out out_of_bounds_indexing false positives fixes of `implicit_return` Ignore generated fresh lifetimes in elision check. ````
"
Mark
" is an ID that identifies both a macro invocation (foo!()
), and expansion process, and expansion result of that macro invocation.The problem is that it's pretty hard to infer that from its name.
This PR renames it into
ExpnId
reflecting its meaning in most contexts.(The contexts where it's meaning is closer to "macro invocation ID" are rarer.)
I've kept "mark" in the names of functions that add or remove marks to/from syntactic contexts, those marks are not just expansion IDs, but something more complex.