Auto merge of #2576 - alexcrichton:silence-warnings-with-q, r=brson

bors · bors · commit e12d5ade0b22 · 2016-04-21T09:34:38.000-07:00
Don't print warnings when -q is passed Closes #2571
diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
@@ -100,7 +100,10 @@ impl MultiShell {
     }
 
     pub fn warn<T: fmt::Display>(&mut self, message: T) -> CargoResult<()> {
-        self.err().say_status("warning:", message, YELLOW, false)
+        match self.verbosity {
+            Quiet => Ok(()),
+            _ => self.err().say_status("warning:", message, YELLOW, false),
+        }
     }
 
     pub fn set_verbosity(&mut self, verbosity: Verbosity) {
diff --git a/tests/test_cargo_install.rs b/tests/test_cargo_install.rs
@@ -644,3 +644,18 @@ test!(git_with_lockfile {
     assert_that(cargo_process("install").arg("--git").arg(p.url().to_string()),
                 execs().with_status(0));
 });
+
+test!(q_silences_warnings {
+    let p = project("foo")
+        .file("Cargo.toml", r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            authors = []
+        "#)
+        .file("src/main.rs", "fn main() {}");
+    p.build();
+
+    assert_that(cargo_process("install").arg("-q").arg("--path").arg(p.root()),
+                execs().with_status(0).with_stderr(""));
+});

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,10 @@ impl MultiShell {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`pub fn warn<T: fmt::Display>(&mut self, message: T) -> CargoResult<()> {`
`103`		`- self.err().say_status("warning:", message, YELLOW, false)`
	`103`	`+ match self.verbosity {`
	`104`	`+ Quiet => Ok(()),`
	`105`	`+ _ => self.err().say_status("warning:", message, YELLOW, false),`
	`106`	`+ }`
`104`	`107`	`}`
`105`	`108`
`106`	`109`	`pub fn set_verbosity(&mut self, verbosity: Verbosity) {`