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

Rollup of 5 pull requests #64321

Merged
merged 11 commits into from
Sep 10, 2019
Merged

Rollup of 5 pull requests #64321

merged 11 commits into from
Sep 10, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 9, 2019

Successful merges:

Failed merges:

r? @ghost

mati865 and others added 11 commits September 6, 2019 14:45
This commit updates the version of the `rustc-std-workspace-*` crates
in-tree which are used in `[patch]`. This will guarantee that Cargo will
select these versions even if minor updates are published to crates.io
because otherwise a newer version on crates.io would be preferred which
misses the point of `[patch]`!
Upgrade rand to 0.7

Also upgrades `getrandom` to avoid bug encountered by rust-lang#61393 which bumps libc to `0.2.62`.
… r=petrochenkov

Always emit unresolved import errors and hide unused import lint

Fix rust-lang#63724.

r? @petrochenkov
Bump RLS and Rustfmt submodules to use rustc-ap-* v583

Closes rust-lang#64180
Closes rust-lang#64179

r? @topecongiro
Update LLVM submodule

Updates the LLVM submodule to current LLVM 9 HEAD.

Fixes rust-lang#63918.
Fixes rust-lang#63791.

r? @alexcrichton
Update version of `rustc-std-workspace-*` crates

This commit updates the version of the `rustc-std-workspace-*` crates
in-tree which are used in `[patch]`. This will guarantee that Cargo will
select these versions even if minor updates are published to crates.io
because otherwise a newer version on crates.io would be preferred which
misses the point of `[patch]`!
@Centril
Copy link
Contributor Author

Centril commented Sep 9, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 9, 2019

📌 Commit 342722e has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 9, 2019
@bors
Copy link
Contributor

bors commented Sep 9, 2019

⌛ Testing commit 342722e with merge f06fe4d...

bors added a commit that referenced this pull request Sep 9, 2019
Rollup of 5 pull requests

Successful merges:

 - #63806 (Upgrade rand to 0.7)
 - #64054 (Always emit unresolved import errors and hide unused import lint)
 - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583)
 - #64317 (Update LLVM submodule)
 - #64320 (Update version of `rustc-std-workspace-*` crates)

Failed merges:

r? @ghost
@tmandry
Copy link
Member

tmandry commented Sep 9, 2019

@Centril Was there a reason not to include #64307 and #64308 in this rollup? If we get those in together with #64279, we should (in theory) be back to a green toolstate.

@Centril
Copy link
Contributor Author

Centril commented Sep 9, 2019

@tmandry Rolling up 3 PRs that affect the toolstate will almost certainly fail the rollup. I should probably not have rolled up RLS/rustfmt either but they are usually less risky than Clippy.

@mati865
Copy link
Contributor

mati865 commented Sep 9, 2019

The problem with Clippy is it depends on various rustc internals. Often it gets broken soon after the fix lands in it's repo but before PR bumping submodule gets even queued.

@bors
Copy link
Contributor

bors commented Sep 10, 2019

💥 Test timed out

@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 Sep 10, 2019
@Centril
Copy link
Contributor Author

Centril commented Sep 10, 2019

@bors retry

@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 Sep 10, 2019
@bors
Copy link
Contributor

bors commented Sep 10, 2019

⌛ Testing commit 342722e with merge 122fefc...

bors added a commit that referenced this pull request Sep 10, 2019
Rollup of 5 pull requests

Successful merges:

 - #63806 (Upgrade rand to 0.7)
 - #64054 (Always emit unresolved import errors and hide unused import lint)
 - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583)
 - #64317 (Update LLVM submodule)
 - #64320 (Update version of `rustc-std-workspace-*` crates)

Failed merges:

r? @ghost
@tmandry
Copy link
Member

tmandry commented Sep 10, 2019

@tmandry Rolling up 3 PRs that affect the toolstate will almost certainly fail the rollup. I should probably not have rolled up RLS/rustfmt either but they are usually less risky than Clippy.

Okay, that makes sense.

From the perspective of a project using nightly builds that wants to update to a new version, it typically doesn't make much difference if 1 tool or 4 tools are broken. In theory, any given tool might be used by some person on the team, so it's binary: the only "safe" update is when all tools are green.

Therefore, I have a proposal: if there are changes queued up that, together, would get toolstate all-green again, can they be bundled as a single rollup and given priority? That way,

  1. We won't waste CI resources on prioritizing changes that fix individual tools (which are likely to break again soon) when other tools remain broken.
  2. When the "stars align" and we have fixes for all tools ready to go, we can prioritize that so master is all-green more of the time (and hopefully more nightlies will be, too.)

I should definitely post this somewhere else, just not sure where :)

@bors
Copy link
Contributor

bors commented Sep 10, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 122fefc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2019
@bors bors merged commit 342722e into rust-lang:master Sep 10, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #64321!

Tested on commit 122fefc.
Direct link to PR: #64321

🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rustfmt on windows: build-fail → test-pass (cc @topecongiro, @rust-lang/infra).
🎉 rustfmt on linux: build-fail → test-pass (cc @topecongiro, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino @amanjeev, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 10, 2019
Tested on commit rust-lang/rust@122fefc.
Direct link to PR: <rust-lang/rust#64321>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rustfmt on windows: build-fail → test-pass (cc @topecongiro, @rust-lang/infra).
🎉 rustfmt on linux: build-fail → test-pass (cc @topecongiro, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino @amanjeev, @rust-lang/infra).
@Centril Centril deleted the rollup-jsj5tpl branch September 10, 2019 04:31
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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. rollup A PR which is a rollup 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.

10 participants