Skip to content

Update Clippy #78310

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

Merged
merged 139 commits into from
Oct 25, 2020
Merged

Update Clippy #78310

merged 139 commits into from
Oct 25, 2020

Conversation

ebroto
Copy link
Member

@ebroto ebroto commented Oct 23, 2020

Biweekly Clippy update.

This includes a Cargo.lock update: ca11eeb (should be rollup=never)

r? @Manishearth

...and also swap their position
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2020
@Manishearth
Copy link
Member

@bors r+ p=2 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

📌 Commit ca11eeb 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 Oct 24, 2020
@bors
Copy link
Collaborator

bors commented Oct 24, 2020

⌛ Testing commit ca11eeb with merge be4d202047b99c6d7d8a3d457c3c38fdd1df6846...

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2020
@ebroto
Copy link
Member Author

ebroto commented Oct 24, 2020

Added a feature to serde_json in rustc_workspace_hack, I hope I got it right :)

Error log thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:196:13 duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build: note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

the following dependencies are duplicated although they have the same features enabled:
the following dependencies have different features:
serde_json 1.0.59 (registry+https://github.com/rust-lang/crates.io-index)
clippy-driver additionally enabled features {"unbounded_depth"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libserde_json-30b8df242489cf1a.rlib"
cargo additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/i686-unknown-freebsd/release/deps/libserde_json-e4a9371b8cda184c.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host i686-unknown-freebsd --target i686-unknown-freebsd
Build completed unsuccessfully in 0:24:11

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

📌 Commit a513919 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 Oct 24, 2020
@bors
Copy link
Collaborator

bors commented Oct 25, 2020

⌛ Testing commit a513919 with merge 7c533c8...

@bors
Copy link
Collaborator

bors commented Oct 25, 2020

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 7c533c8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2020
@bors bors merged commit 7c533c8 into rust-lang:master Oct 25, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 25, 2020
@ebroto ebroto deleted the clippyup branch October 28, 2020 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.