Skip to content
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

Use the new rustc interface #3733

Merged
merged 2 commits into from
Mar 10, 2019
Merged

Use the new rustc interface #3733

merged 2 commits into from
Mar 10, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Feb 1, 2019

Shows the changes required to compile with rust-lang/rust#56732

@bors
Copy link
Collaborator

bors commented Feb 2, 2019

☔ The latest upstream changes (presumably #2857) made this pull request unmergeable. Please resolve the merge conflicts.

@phansch phansch added S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work and removed S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work labels Feb 24, 2019
@flip1995 flip1995 added the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label Mar 9, 2019
@Zoxc Zoxc changed the title [WIP] Use the new rustc interface Use the new rustc interface Mar 10, 2019
src/driver.rs Outdated
struct ClippyCallbacks;

impl rustc_driver::Callbacks for ClippyCallbacks {
fn after_parsing(&mut self, compiler: &interface::Compiler<'_>) -> bool {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fn after_parsing(&mut self, compiler: &interface::Compiler<'_>) -> bool {
fn after_parsing(&mut self, compiler: &interface::Compiler) -> bool {

Won't compile again otherwise

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll just fix this myself and merge

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed =P

Manishearth added a commit that referenced this pull request Mar 10, 2019
Updates clippy to work with new driver stuff from rust-lang/rust#56732

See #3733
@Manishearth
Copy link
Member

merge on travis pass

@Manishearth
Copy link
Member

Oh wait bors does that for us lol

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 10, 2019

📌 Commit 0d4a19c has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Mar 10, 2019

⌛ Testing commit 0d4a19c with merge 1a8d19a...

bors added a commit that referenced this pull request Mar 10, 2019
Use the new rustc interface

Shows the changes required to compile with rust-lang/rust#56732
@bors
Copy link
Collaborator

bors commented Mar 10, 2019

💔 Test failed - checks-travis

sess.plugin_attributes.borrow_mut().extend(attributes);

// Continue execution
true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old code did controller.compilation_done.stop = Compilation::Stop;, isn't this a change in behavior? (Same thing as in Miri, which is the only reason I noticed this.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stopping after compilation is done doesn't really do anything.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was mostly worried about Clippy accidentally emitting a binary (which a bug in Miri made it do for some time, and I actually have no idea what made it stop doing that). Not sure if that's related to stopping here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous (and new) code should emit a binary here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stopping after compilation is done doesn't really do anything.

This might be what's causing cargo clippy not do anything on a second run. We should investigate in the future, but this PR does the right thing in keeping the previous behaviour

@oli-obk
Copy link
Contributor

oli-obk commented Mar 10, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 10, 2019

📌 Commit 1388f24 has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented Mar 10, 2019

⌛ Testing commit 1388f24 with merge 016d92d...

bors added a commit that referenced this pull request Mar 10, 2019
Use the new rustc interface

Shows the changes required to compile with rust-lang/rust#56732
@bors
Copy link
Collaborator

bors commented Mar 10, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 016d92d to master...

@bors bors merged commit 1388f24 into rust-lang:master Mar 10, 2019
@Zoxc Zoxc deleted the rustc-interface branch March 10, 2019 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants