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

[1.60] Fix term.verbose without quiet, and vice versa #10436

Merged
merged 1 commit into from
Mar 1, 2022

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 1, 2022

Backport of #10429 to fix a regression in 1.59.

The match pattern only looked for `Some(false)`, missing `None`.

(cherry picked from commit ec1bdd2)
@rust-highfive
Copy link

r? @ehuss

(rust-highfive has picked a reviewer for you, 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.60.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 Mar 1, 2022
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 1, 2022

📌 Commit 6034981 has been approved by alexcrichton

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

bors commented Mar 1, 2022

⌛ Testing commit 6034981 with merge d1fd9fe...

@bors
Copy link
Contributor

bors commented Mar 1, 2022

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing d1fd9fe to rust-1.60.0...

@bors bors merged commit d1fd9fe into rust-lang:rust-1.60.0 Mar 1, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2022
[beta] Beta backports

* No branch protection metadata unless enabled rust-lang#93516
* update auto trait lint for PhantomData rust-lang#94315
* Cargo:
    * [1.60] Fix term.verbose without quiet, and vice versa (rust-lang/cargo#10436)
    * [beta] Add common profile validation. (rust-lang/cargo#10413)
    * Avoid new deprecation warnings from clap 3.1.0 (rust-lang/cargo#10396)
@ehuss ehuss added this to the 1.60.0 milestone Apr 7, 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.

5 participants