Skip to content

Commit 235e2c2

Browse files
committed
Auto merge of #2722 - alexcrichton:stderr-not-stdout, r=alexcrichton
Report status to stderr -- last few tests Fixup of #2693 for the last few tests.
2 parents 3b541da + 43234cd commit 235e2c2

29 files changed

+660
-670
lines changed

src/cargo/core/shell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl MultiShell {
7373
{
7474
match self.verbosity {
7575
Quiet => Ok(()),
76-
_ => self.out().say_status(status, message, GREEN, true)
76+
_ => self.err().say_status(status, message, GREEN, true)
7777
}
7878
}
7979

tests/test_bad_config.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ test!(bad3 {
7171
"#);
7272
assert_that(foo.cargo_process("publish").arg("-v"),
7373
execs().with_status(101).with_stderr("\
74+
[UPDATING] registry `https://[..]`
7475
[ERROR] invalid configuration for key `http.proxy`
7576
expected a string, but found a boolean in [..]config
7677
"));
@@ -232,6 +233,7 @@ test!(bad_git_dependency {
232233

233234
assert_that(foo.cargo_process("build").arg("-v"),
234235
execs().with_status(101).with_stderr("\
236+
[UPDATING] git repository `file:///`
235237
[ERROR] Unable to update file:///
236238
237239
Caused by:
@@ -258,6 +260,8 @@ test!(bad_crate_type {
258260
assert_that(foo.cargo_process("build").arg("-v"),
259261
execs().with_status(0).with_stderr("\
260262
warning: crate-type \"bad_type\" was not one of lib|rlib|dylib|staticlib
263+
[COMPILING] foo v0.0.0 (file:///[..])
264+
[RUNNING] `rustc [..] --crate-type rlib [..]`
261265
"));
262266
});
263267

@@ -430,6 +434,7 @@ test!(unused_keys {
430434
assert_that(foo.cargo_process("build"),
431435
execs().with_status(0).with_stderr("\
432436
warning: unused manifest key: target.foo.bar
437+
[COMPILING] foo v0.1.0 (file:///[..])
433438
"));
434439
});
435440

0 commit comments

Comments
 (0)