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

[STABLE-1.62] Bump cargo util stable #10806

Merged
merged 3 commits into from
Jul 1, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 30, 2022

This is a stable backport of #10804. This uses version 0.2.0 compared to 0.2.1 on beta since beta has had some minor (compatible) changes.

cc #10803

@rust-highfive
Copy link

@ehuss: no appropriate reviewer found, use r? to override

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.62.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2022
@ehuss ehuss force-pushed the bump-cargo-util-stable-1.62 branch from ec01462 to 524745d Compare June 30, 2022 21:41
ehuss and others added 2 commits June 30, 2022 15:07
This is due to a change in clap 3.2. Cargo's CI runs without a lock
file, but rust-lang/rust runs with one (locked to an older version). To
avoid issues, this just ignores the test. See
rust-lang#10753 for more.
Fix tests due to change in dead_code diagnostic.

rust-lang/rust#97853 changed some diagnostics which is causing some tests to fail on the latest nightly.  This updates the tests to work on both stable and nightly.
@joshtriplett
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2022

📌 Commit 20e282b has been approved by joshtriplett

@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 Jul 1, 2022
@bors
Copy link
Contributor

bors commented Jul 1, 2022

⌛ Testing commit 20e282b with merge d39343d...

@joshtriplett
Copy link
Member

@bors p=10

@bors
Copy link
Contributor

bors commented Jul 1, 2022

☀️ Test successful - checks-actions
Approved by: joshtriplett
Pushing d39343d to rust-1.62.0...

@bors bors merged commit d39343d into rust-lang:rust-1.62.0 Jul 1, 2022
@ehuss ehuss added this to the 1.62.0 milestone Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants