Skip to content

Commit 3b735c6

Browse files
committed
Auto merge of #7369 - jonas-schievink:the-little-c-that-Could, r=alexcrichton
Uncapitalize "Could not compile" error message "could not compile ..." matches other Cargo and rustc errors and warnings better.
2 parents 13bc9a1 + 26229cd commit 3b735c6

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ fn rustc<'a, 'cfg>(
300300
&mut |line| on_stderr_line(state, line, package_id, &target, &mut output_options),
301301
)
302302
.map_err(internal_if_simple_exit_code)
303-
.chain_err(|| format!("Could not compile `{}`.", name))?;
303+
.chain_err(|| format!("could not compile `{}`.", name))?;
304304
}
305305

306306
if do_rename && real_name != crate_name {

tests/testsuite/build.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ fn cargo_compile_with_invalid_code() {
511511
.with_status(101)
512512
.with_stderr_contains(
513513
"\
514-
[ERROR] Could not compile `foo`.
514+
[ERROR] could not compile `foo`.
515515
516516
To learn more, run the command again with --verbose.\n",
517517
)
@@ -551,7 +551,7 @@ fn cargo_compile_with_invalid_code_in_deps() {
551551
p.cargo("build")
552552
.with_status(101)
553553
.with_stderr_contains("[..]invalid rust code[..]")
554-
.with_stderr_contains("[ERROR] Could not compile [..]")
554+
.with_stderr_contains("[ERROR] could not compile [..]")
555555
.run();
556556
}
557557

@@ -4528,7 +4528,7 @@ fn signal_display() {
45284528
"\
45294529
[COMPILING] pm [..]
45304530
[COMPILING] foo [..]
4531-
[ERROR] Could not compile `foo`.
4531+
[ERROR] could not compile `foo`.
45324532
45334533
Caused by:
45344534
process didn't exit successfully: `rustc [..]` (signal: 6, SIGABRT: process abort signal)
@@ -4660,7 +4660,7 @@ fn pipelining_big_graph() {
46604660
foo.cargo("build -p foo")
46614661
.env("CARGO_BUILD_PIPELINING", "true")
46624662
.with_status(101)
4663-
.with_stderr_contains("[ERROR] Could not compile `a30`[..]")
4663+
.with_stderr_contains("[ERROR] could not compile `a30`[..]")
46644664
.run();
46654665
}
46664666

tests/testsuite/build_script.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ fn build_deps_not_for_normal() {
10721072
.with_stderr_contains("[..]can't find crate for `aaaaa`[..]")
10731073
.with_stderr_contains(
10741074
"\
1075-
[ERROR] Could not compile `foo`.
1075+
[ERROR] could not compile `foo`.
10761076
10771077
Caused by:
10781078
process didn't exit successfully: [..]

tests/testsuite/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ fn short_message_format() {
684684
"\
685685
src/lib.rs:1:27: error[E0308]: mismatched types
686686
error: aborting due to previous error
687-
error: Could not compile `foo`.
687+
error: could not compile `foo`.
688688
",
689689
)
690690
.run();

tests/testsuite/fix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn do_not_fix_broken_builds() {
2626
p.cargo("fix --allow-no-vcs")
2727
.env("__CARGO_FIX_YOLO", "1")
2828
.with_status(101)
29-
.with_stderr_contains("[ERROR] Could not compile `foo`.")
29+
.with_stderr_contains("[ERROR] could not compile `foo`.")
3030
.run();
3131
assert!(p.read_file("src/lib.rs").contains("let mut x = 3;"));
3232
}

tests/testsuite/install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ fn compile_failure() {
606606
found at `[..]target`
607607
608608
Caused by:
609-
Could not compile `foo`.
609+
could not compile `foo`.
610610
611611
To learn more, run the command again with --verbose.
612612
",

0 commit comments

Comments
 (0)