Send --help output to stdout

Fixes #4878
rust-lang · Jan 1, 2018 · f4537b2 · f4537b2
1 parent a88fbac
commit f4537b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
@@ -142,7 +142,8 @@ pub fn exit_with_error(err: CliError, shell: &mut Shell) -> ! {
         } else if fatal {
             drop(shell.error(&error))
         } else {
-            drop(writeln!(shell.err(), "{}", error))
+            // Non-fatal messages, like --help output, go to stdout.
+            println!("{}", error);
         }
 
         if !handle_cause(&error, shell) || hide {

diff --git a/tests/search.rs b/tests/search.rs
@@ -277,4 +277,9 @@ fn help() {
                 execs().with_status(0));
     assert_that(cargo_process("help").arg("search"),
                 execs().with_status(0));
+    // Ensure that help output goes to stdout, not stderr.
+    assert_that(cargo_process("search").arg("--help"),
+                execs().with_stderr(""));
+    assert_that(cargo_process("search").arg("--help"),
+                execs().with_stdout_contains("[..] --frozen [..]"));
 }