From 6034981325f22adad46a2f94fd1c665fa7d7a2a1 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Sat, 26 Feb 2022 14:17:00 -0800
Subject: [PATCH] Fix term.verbose without quiet, and vice versa

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

(cherry picked from commit ec1bdd20a2a31fe0dea64363e7f04223995ab15b)
---
 src/cargo/util/config/mod.rs |  4 ++--
 tests/testsuite/run.rs       | 41 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
index 0f183cdf563..826336b52be 100644
--- a/src/cargo/util/config/mod.rs
+++ b/src/cargo/util/config/mod.rs
@@ -919,8 +919,8 @@ impl Config {
                 (Some(true), Some(true)) => {
                     bail!("cannot set both `term.verbose` and `term.quiet`")
                 }
-                (Some(true), Some(false)) => Verbosity::Verbose,
-                (Some(false), Some(true)) => Verbosity::Quiet,
+                (Some(true), _) => Verbosity::Verbose,
+                (_, Some(true)) => Verbosity::Quiet,
                 _ => Verbosity::Normal,
             },
         };
diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
index e162b22c98e..0ef9d49cdcf 100644
--- a/tests/testsuite/run.rs
+++ b/tests/testsuite/run.rs
@@ -88,6 +88,47 @@ fn verbose_arg_and_quiet_config() {
         .run();
 }
 
+#[cargo_test]
+fn quiet_config_alone() {
+    let p = project()
+        .file(
+            ".cargo/config",
+            r#"
+                [term]
+                quiet = true
+            "#,
+        )
+        .file("src/main.rs", r#"fn main() { println!("hello"); }"#)
+        .build();
+
+    p.cargo("run").with_stderr("").with_stdout("hello").run();
+}
+
+#[cargo_test]
+fn verbose_config_alone() {
+    let p = project()
+        .file(
+            ".cargo/config",
+            r#"
+                [term]
+                verbose = true
+            "#,
+        )
+        .file("src/main.rs", r#"fn main() { println!("hello"); }"#)
+        .build();
+
+    p.cargo("run")
+        .with_stderr(
+            "\
+[COMPILING] foo v0.0.1 ([CWD])
+[RUNNING] `rustc [..]
+[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+[RUNNING] `target/debug/foo[EXE]`",
+        )
+        .with_stdout("hello")
+        .run();
+}
+
 #[cargo_test]
 fn quiet_config_and_verbose_config() {
     let p = project()