-
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
Update Clippy, RLS and rustfmt #58337
Conversation
|
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 r+ p=1 |
📌 Commit 4613e4b6237a5cb637a2c993a050eaadf1364948 has been approved by |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
Rebased on master and re-updated Clippy and RLS |
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 |
|
Also an update of rustfmt was required. This supersedes #58356 now. |
@flip1995 Could we bump RLS version to rust-lang/rls@6c0bbf5? This should still only pull v366 of |
0330d9b
to
b95fbff
Compare
@Xanewok Done! |
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 |
Well, this is unsettling. We need to do another coordinated rustc-ap-* bump to a version that has no more than 12 days it seems due to this change, and it seems clippy doesn't compile:
|
I fixed this in rust-lang/rust-clippy#3760. Just waiting for AppVeyor so it can get merged. This PR already points to the commit with the fix.
Is there anything I can do to help with that? |
Updated Cargo.lock again. Let's go for take 5 (or 6?) Does the delegate still apply? @bors r=Xanewok |
📌 Commit 4c228cc has been approved by |
Update Clippy, RLS and rustfmt Update Clippy to rust-lang/rust-clippy@32ee306 Update RLS to rust-lang/rls@0d6f53e Update rustfmt to rust-lang/rustfmt@d6829d6 r? @Manishearth @oli-obk
⌛ Testing commit 4c228cc with merge 2cea257a50a4657b058d79362e77121a08bc4f4c... |
💔 Test failed - status-appveyor |
Network issue:
|
@bors retry |
⌛ Testing commit 4c228cc with merge cf3747e92262a4b7bde2276ac9f8e5c9f00ebf10... |
💔 Test failed - status-appveyor |
@bors r- Please update clippy.
|
Moving this to #58571 since I don't want to wait for more things to break |
Update clippy, RLS, and rustfmt moved from #58337
Update Clippy to rust-lang/rust-clippy@32ee306
Update RLS to rust-lang/rls@0d6f53e
Update rustfmt to rust-lang/rustfmt@d6829d6
r? @Manishearth @oli-obk