itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #7369 - jonas-schievink:the-little-c-that-Could, r=alexcrichton

Browse Source 
Uncapitalize "Could not compile" error message

"could not compile ..." matches other Cargo and rustc errors and
warnings better.
This commit is contained in:
bors 2019-09-17 15:02:05 +00:00
commit 3b735c6305
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/core/compiler/mod.rs
View File

@ -300,7 +300,7 @@ fn rustc<'a, 'cfg>(
&mut |line| on_stderr_line(state, line, package_id, &target, &mut output_options), &mut |line| on_stderr_line(state, line, package_id, &target, &mut output_options),
) )
.map_err(internal_if_simple_exit_code) .map_err(internal_if_simple_exit_code)
.chain_err(|| format!("Could not compile `{}`.", name))?; .chain_err(|| format!("could not compile `{}`.", name))?;
} }
if do_rename && real_name != crate_name { if do_rename && real_name != crate_name {

8
tests/testsuite/build.rs
View File

@ -511,7 +511,7 @@ fn cargo_compile_with_invalid_code() {
.with_status(101) .with_status(101)
.with_stderr_contains( .with_stderr_contains(
"\ "\
[ERROR] Could not compile `foo`. [ERROR] could not compile `foo`.
To learn more, run the command again with --verbose.\n", To learn more, run the command again with --verbose.\n",
) )
@ -551,7 +551,7 @@ fn cargo_compile_with_invalid_code_in_deps() {
p.cargo("build") p.cargo("build")
.with_status(101) .with_status(101)
.with_stderr_contains("[..]invalid rust code[..]") .with_stderr_contains("[..]invalid rust code[..]")
.with_stderr_contains("[ERROR] Could not compile [..]") .with_stderr_contains("[ERROR] could not compile [..]")
.run(); .run();
} }
@ -4528,7 +4528,7 @@ fn signal_display() {
"\ "\
[COMPILING] pm [..] [COMPILING] pm [..]
[COMPILING] foo [..] [COMPILING] foo [..]
[ERROR] Could not compile `foo`. [ERROR] could not compile `foo`.
Caused by: Caused by:
process didn't exit successfully: `rustc [..]` (signal: 6, SIGABRT: process abort signal) process didn't exit successfully: `rustc [..]` (signal: 6, SIGABRT: process abort signal)
@ -4660,7 +4660,7 @@ fn pipelining_big_graph() {
foo.cargo("build -p foo") foo.cargo("build -p foo")
.env("CARGO_BUILD_PIPELINING", "true") .env("CARGO_BUILD_PIPELINING", "true")
.with_status(101) .with_status(101)
.with_stderr_contains("[ERROR] Could not compile `a30`[..]") .with_stderr_contains("[ERROR] could not compile `a30`[..]")
.run(); .run();
} }

2
tests/testsuite/build_script.rs
View File

@ -1072,7 +1072,7 @@ fn build_deps_not_for_normal() {
.with_stderr_contains("[..]can't find crate for `aaaaa`[..]") .with_stderr_contains("[..]can't find crate for `aaaaa`[..]")
.with_stderr_contains( .with_stderr_contains(
"\ "\
[ERROR] Could not compile `foo`. [ERROR] could not compile `foo`.
Caused by: Caused by:
process didn't exit successfully: [..] process didn't exit successfully: [..]

2
tests/testsuite/check.rs
View File

@ -684,7 +684,7 @@ fn short_message_format() {
"\ "\
src/lib.rs:1:27: error[E0308]: mismatched types src/lib.rs:1:27: error[E0308]: mismatched types
error: aborting due to previous error error: aborting due to previous error
error: Could not compile `foo`. error: could not compile `foo`.
", ",
) )
.run(); .run();

2
tests/testsuite/fix.rs
View File

@ -26,7 +26,7 @@ fn do_not_fix_broken_builds() {
p.cargo("fix --allow-no-vcs") p.cargo("fix --allow-no-vcs")
.env("__CARGO_FIX_YOLO", "1") .env("__CARGO_FIX_YOLO", "1")
.with_status(101) .with_status(101)
.with_stderr_contains("[ERROR] Could not compile `foo`.") .with_stderr_contains("[ERROR] could not compile `foo`.")
.run(); .run();
assert!(p.read_file("src/lib.rs").contains("let mut x = 3;")); assert!(p.read_file("src/lib.rs").contains("let mut x = 3;"));
} }

2
tests/testsuite/install.rs
View File

@ -606,7 +606,7 @@ fn compile_failure() {
found at `[..]target` found at `[..]target`
Caused by: Caused by:
Could not compile `foo`. could not compile `foo`.
To learn more, run the command again with --verbose. To learn more, run the command again with --verbose.
", ",