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.

Sign up for GitHub

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

Jump to bottom

Update clippy #50020

Merged
merged 1 commit into from
Apr 19, 2018
Merged

Update clippy #50020

merged 1 commit into from
Apr 19, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Apr 17, 2018

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2018
@oli-obk oli-obk changed the title Update clippy Update clippy and rls Apr 17, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 17, 2018 •
edited
Loading

cc @nrc also updating rls in here

Nevermind:

error[E0308]: mismatched types
    --> /home/oliver/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_errors-100.0.0/emitter.rs:1392:39
     |
1392 |     (b_start..b_end + extra).contains(a_start) ||
     |                                       ^^^^^^^
     |                                       |
     |                                       expected &usize, found usize
     |                                       help: consider borrowing here: `&a_start`
     |
     = note: expected type `&usize`
                found type `usize`

@oli-obk oli-obk changed the title Update clippy and rls Update clippy Apr 17, 2018
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 17, 2018

📌 Commit a7dae98 has been approved by Manishearth

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2018
@bors
Copy link
Contributor

bors commented Apr 18, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 19, 2018

@bors r=Manishearth p=1

@bors
Copy link
Contributor

bors commented Apr 19, 2018

📌 Commit 0f1f9a7 has been approved by Manishearth

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 19, 2018
bors added a commit that referenced this pull request Apr 19, 2018
@bors
Auto merge of #50020 - oli-obk:clippy, r=Manishearth
8830a03 
Update clippy

r? @Manishearth
@bors
Copy link
Contributor

bors commented Apr 19, 2018

⌛ Testing commit 0f1f9a7 with merge 8830a03...

@bors
Copy link
Contributor

bors commented Apr 19, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Manishearth
Pushing 8830a03 to master...

@bors bors merged commit 0f1f9a7 into rust-lang:master Apr 19, 2018
@kennytm-githubbot
Copy link

📣 Toolstate changed by #50020!

Tested on commit 8830a03.
Direct link to PR: #50020

🎉 clippy-driver on windows: build-fail → test-pass.
🎉 clippy-driver on linux: build-fail → test-pass.

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 19, 2018
@kennytm-githubbot
📣 Toolstate changed by rust-lang/rust#50020!
8c16f67 
Tested on commit rust-lang/rust@8830a03.
Direct link to PR: <rust-lang/rust#50020>

🎉 clippy-driver on windows: build-fail → test-pass.
🎉 clippy-driver on linux: build-fail → test-pass.
@bors bors mentioned this pull request Apr 19, 2018
Merged
@alexcrichton
Copy link
Member

Hm it looks like this broke the RLS presumably because clippy is succeeding but the RLS is still using an older version? (but clippy succeeding causes rustbuild to enable clippy in the RLS I think).

cc @nrc

@oli-obk oli-obk deleted the clippy branch April 21, 2018 08:27
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 21, 2018

That shouldn't matter. Rls in the rustc repo uses the working one, not the crates.io one

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@oli-obk @rust-highfive @Manishearth @bors @kennytm-githubbot @alexcrichton