Add an after_expansion callback in the driver
#62679
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
rust-highfive
added
the
S-waiting-on-review
Zoxc
reviewed
Jul 15, 2019
Zoxc
reviewed
Jul 15, 2019
How hard is it to adjust existing drivers to the changed interface? Do we just have replace the |
|
Addressed the feedback. Is this good now? |
Yup, that's it! Figured it'd be more readable than bool, I found myself commenting // Continue execution
trueso a |
|
@bors r+ |
|
📌 Commit ff63336 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit ff63336 with merge e8e0c666bad1a6e0af6a11fcff0db39a881e04a0... |
|
💔 Test failed - checks-azure |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
bors
removed
the
S-waiting-on-bors
Seems spurious? @bors retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit ff63336 with merge e1693a9700e87126a97497ccf3ccc582ed2231f4... |
bors
added a commit
that referenced
this pull request
Jul 19, 2019
Add an `after_expansion` callback in the driver
To format a given file RLS needs to know the Rust edition associated with it. It's not enough to look at the `edition` key in Cargo.toml - each crate target can have a different edition associated with it so the sure way to fetch a correct edition is to scan the input files used to compile a given crate target.
Right now this was done in the `after_analysis` callback of our shim, however this leads to other problems - if a crate cannot be successfully compiled (e.g. it has a type error) then a callback would not be invoked meaning we can't populate the files -> edition mapping.
However, doing this only after parsing is not enough, since expansion can pull in additional source files (e.g. by invoking `macro_rules! include_my_mod { () => { mod some_mod; }; }`).
Without copy-pasting the entire driver setup it's also not possible to expand the crate ourselves in the `after_parsing` callback - to expand crate we'd need to register plugins and initialize session ourselves. However, this is done normally after executing the callback itself, thus triggering the `Once::set` assertions in `Session::init_features`.
r? @Zoxc
cc @RalfJung @oli-obk this affects public driver interface used by Miri and Clippy
|
☀️ Test successful - checks-azure |
|
📣 Toolstate changed by #62679! Tested on commit 527dce7. 💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Jul 19, 2019
Tested on commit rust-lang/rust@527dce7. Direct link to PR: <rust-lang/rust#62679> 💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 rls on windows: test-pass → build-fail (cc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).
matthiaskrgr
added a commit
to matthiaskrgr/rust-clippy
that referenced
this pull request
Jul 19, 2019
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Jul 19, 2019
rustup rust-lang/rust#62679 changelog: none
matthiaskrgr
added a commit
to matthiaskrgr/rls
that referenced
this pull request
Jul 19, 2019
Xanewok
pushed a commit
to Xanewok/rls
that referenced
this pull request
Jul 21, 2019
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 22, 2019
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` ````
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 24, 2019
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. ````
bors
added a commit
that referenced
this pull request
Jul 24, 2019
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
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 27, 2019
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. ````
bors
added a commit
that referenced
this pull request
Jul 28, 2019
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
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 30, 2019
Update RLS and Rustfmt Supersedes rust-lang#62537. Closes rust-lang#62803. Fixes fallout after rust-lang#62679. r? @ghost
Merged
bors
added a commit
that referenced
this pull request
Aug 8, 2019
Update RLS Most importantly this includes: * Collect file -> edition mapping after AST expansion ([#1513](rust-lang/rls#1513)) (enabled by #62679) * Fix rustfmt during builds by reading edition from manifest ([#1533](rust-lang/rls#1533)) Which fixes the annoying problem where users couldn't format via RLS while `cargo fmt` worked. The beta cut-off is drawing near and I'd like to make sure this lands before then.
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
May 5, 2020
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. ````
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.
To format a given file RLS needs to know the Rust edition associated with it. It's not enough to look at the
editionkey in Cargo.toml - each crate target can have a different edition associated with it so the sure way to fetch a correct edition is to scan the input files used to compile a given crate target.Right now this was done in the
after_analysiscallback of our shim, however this leads to other problems - if a crate cannot be successfully compiled (e.g. it has a type error) then a callback would not be invoked meaning we can't populate the files -> edition mapping.However, doing this only after parsing is not enough, since expansion can pull in additional source files (e.g. by invoking
macro_rules! include_my_mod { () => { mod some_mod; }; }).Without copy-pasting the entire driver setup it's also not possible to expand the crate ourselves in the
after_parsingcallback - to expand crate we'd need to register plugins and initialize session ourselves. However, this is done normally after executing the callback itself, thus triggering theOnce::setassertions inSession::init_features.r? @Zoxc
cc @RalfJung @oli-obk this affects public driver interface used by Miri and Clippy