Skip to content

Commit f6706af

Browse files
authored
fix(cli): Use stderr for user messages (#527)
Fixes #526
1 parent 712aeb7 commit f6706af

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

src/bin/add/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn print_msg(dep: &Dependency, section: &[String], optional: bool) -> Result<()>
7474
} else {
7575
ColorChoice::Never
7676
};
77-
let mut output = StandardStream::stdout(colorchoice);
77+
let mut output = StandardStream::stderr(colorchoice);
7878
output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
7979
write!(output, "{:>12}", "Adding")?;
8080
output.reset()?;

src/bin/rm/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn print_msg(name: &str, section: &str) -> Result<()> {
9494
} else {
9595
ColorChoice::Never
9696
};
97-
let mut output = StandardStream::stdout(colorchoice);
97+
let mut output = StandardStream::stderr(colorchoice);
9898
output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
9999
write!(output, "{:>12}", "Removing")?;
100100
output.reset()?;

src/bin/set-version/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl Manifests {
209209
}
210210

211211
fn dry_run_message() -> Result<()> {
212-
let bufwtr = BufferWriter::stdout(ColorChoice::Always);
212+
let bufwtr = BufferWriter::stderr(ColorChoice::Always);
213213
let mut buffer = bufwtr.buffer();
214214
buffer
215215
.set_color(ColorSpec::new().set_fg(Some(Color::Cyan)).set_bold(true))
@@ -241,7 +241,7 @@ fn deprecated_message(message: &str) -> Result<()> {
241241
}
242242

243243
fn upgrade_message(name: &str, from: &semver::Version, to: &semver::Version) -> Result<()> {
244-
let bufwtr = BufferWriter::stdout(ColorChoice::Always);
244+
let bufwtr = BufferWriter::stderr(ColorChoice::Always);
245245
let mut buffer = bufwtr.buffer();
246246
buffer
247247
.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))
@@ -258,7 +258,7 @@ fn upgrade_message(name: &str, from: &semver::Version, to: &semver::Version) ->
258258
}
259259

260260
fn upgrade_dependent_message(name: &str, old_req: &str, new_req: &str) -> Result<()> {
261-
let bufwtr = BufferWriter::stdout(ColorChoice::Always);
261+
let bufwtr = BufferWriter::stderr(ColorChoice::Always);
262262
let mut buffer = bufwtr.buffer();
263263
buffer
264264
.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))

src/bin/upgrade/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn deprecated_message(message: &str) -> Result<()> {
151151
}
152152

153153
fn dry_run_message() -> Result<()> {
154-
let bufwtr = BufferWriter::stdout(ColorChoice::Always);
154+
let bufwtr = BufferWriter::stderr(ColorChoice::Always);
155155
let mut buffer = bufwtr.buffer();
156156
buffer
157157
.set_color(ColorSpec::new().set_fg(Some(Color::Cyan)).set_bold(true))

src/fetch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub fn update_registry_index(registry: &Url, quiet: bool) -> Result<()> {
9898
} else {
9999
ColorChoice::Never
100100
};
101-
let mut output = StandardStream::stdout(colorchoice);
101+
let mut output = StandardStream::stderr(colorchoice);
102102

103103
let index = crates_index::BareIndex::from_url(registry.as_str())?;
104104
let mut index = index.open_or_clone()?;

src/manifest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fn print_upgrade_if_necessary(
137137
if old_version == new_version {
138138
return Ok(());
139139
}
140-
let bufwtr = BufferWriter::stdout(ColorChoice::Always);
140+
let bufwtr = BufferWriter::stderr(ColorChoice::Always);
141141
let mut buffer = bufwtr.buffer();
142142
buffer
143143
.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))

tests/cargo-add.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ fn adds_dependency_normalized_name() {
14411441
&format!("--manifest-path={}", manifest),
14421442
])
14431443
.success()
1444-
.stdout(predicates::str::contains(
1444+
.stderr(predicates::str::contains(
14451445
"WARN: Added `linked-hash-map` instead of `linked_hash_map`",
14461446
));
14471447

@@ -1758,7 +1758,7 @@ fn add_prints_message() {
17581758
.env("CARGO_IS_TEST", "1")
17591759
.assert()
17601760
.success()
1761-
.stdout(predicates::str::contains(
1761+
.stderr(predicates::str::contains(
17621762
"Adding docopt v0.6.0 to dependencies",
17631763
));
17641764
}
@@ -1780,7 +1780,7 @@ fn add_prints_message_with_section() {
17801780
.env("CARGO_IS_TEST", "1")
17811781
.assert()
17821782
.success()
1783-
.stdout(predicates::str::contains(
1783+
.stderr(predicates::str::contains(
17841784
"Adding clap v0.1.0 to optional dependencies for target `mytarget`",
17851785
));
17861786
}
@@ -1802,7 +1802,7 @@ fn add_prints_message_for_dev_deps() {
18021802
.env("CARGO_IS_TEST", "1")
18031803
.assert()
18041804
.success()
1805-
.stdout(predicates::str::contains(
1805+
.stderr(predicates::str::contains(
18061806
"Adding docopt v0.8.0 to dev-dependencies",
18071807
));
18081808
}
@@ -1824,7 +1824,7 @@ fn add_prints_message_for_build_deps() {
18241824
.env("CARGO_IS_TEST", "1")
18251825
.assert()
18261826
.success()
1827-
.stdout(predicates::str::contains(
1827+
.stderr(predicates::str::contains(
18281828
"Adding hello-world v0.1.0 to build-dependencies",
18291829
));
18301830
}
@@ -1956,7 +1956,7 @@ fn add_prints_message_for_features_deps() {
19561956
.env("CARGO_IS_TEST", "1")
19571957
.assert()
19581958
.success()
1959-
.stdout(predicates::str::contains(
1959+
.stderr(predicates::str::contains(
19601960
r#"Adding hello-world v0.1.0 to dependencies with features: ["jui"]"#,
19611961
));
19621962
}

tests/cargo-rm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ fn rm_prints_message() {
244244
.args(&["rm", "semver", &format!("--manifest-path={}", manifest)])
245245
.assert()
246246
.success()
247-
.stdout(" Removing semver from dependencies\n");
247+
.stderr(" Removing semver from dependencies\n");
248248
}
249249

250250
#[test]
@@ -261,7 +261,7 @@ fn rm_prints_messages_for_multiple() {
261261
])
262262
.assert()
263263
.success()
264-
.stdout(" Removing semver from dependencies\n Removing docopt from dependencies\n");
264+
.stderr(" Removing semver from dependencies\n Removing docopt from dependencies\n");
265265
}
266266

267267
#[test]

tests/cargo-upgrade.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,5 +550,5 @@ fn upgrade_prints_messages() {
550550
])
551551
.assert()
552552
.success()
553-
.stdout(predicates::str::contains("docopt v0.8 -> v"));
553+
.stderr(predicates::str::contains("docopt v0.8 -> v"));
554554
}

0 commit comments

Comments
 (0)