development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 05:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #5391 - varkor:check-message, r=alexcrichton

Browse source 
Print "Checking" for cargo check

I often alternate between `check` and `build` and I'd like to be able to tell which is currently happening (short-term memory being what it is, and "compiling" implying to me that codegen is occurring). Changing the message to "Checking" seemed to be reasonable (and there was precedent for `doc` with "Documenting").
This commit is contained in:
bors 2018-04-19 22:21:08 +00:00
parent 0a33eb2a75 97b971a775
commit db90cfeaab
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cargo/core/compiler/job_queue.rs
View file

@ -383,7 +383,11 @@ impl<'a> JobQueue<'a> {
}
} else {
self.compiled.insert(key.pkg);
config.shell().status("Compiling", key.pkg)?;
if key.profile.check {
config.shell().status("Checking", key.pkg)?;
} else {
config.shell().status("Compiling", key.pkg)?;
}
}
}
Fresh if self.counts[key.pkg] == 0 => {

1
tests/testsuite/cargotest/support/mod.rs
View file

@ -1002,6 +1002,7 @@ fn substitute_macros(input: &str) -> String {
let macros = [
("[RUNNING]", " Running"),
("[COMPILING]", " Compiling"),
("[CHECKING]", " Checking"),
("[CREATED]", " Created"),
("[FINISHED]", " Finished"),
("[ERROR]", "error:"),

8
tests/testsuite/doc.rs
View file

@ -217,7 +217,7 @@ fn doc_no_deps() {
p.cargo("doc").arg("--no-deps"),
execs().with_status(0).with_stderr(&format!(
"\
[COMPILING] bar v0.0.1 ({dir}/bar)
[CHECKING] bar v0.0.1 ({dir}/bar)
[DOCUMENTING] foo v0.0.1 ({dir})
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -596,7 +596,7 @@ fn doc_lib_bin_same_name_documents_named_bin_when_requested() {
p.cargo("doc").arg("--bin").arg("foo"),
execs().with_status(0).with_stderr(&format!(
"\
[COMPILING] foo v0.0.1 ({dir})
[CHECKING] foo v0.0.1 ({dir})
[DOCUMENTING] foo v0.0.1 ({dir})
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -650,7 +650,7 @@ fn doc_lib_bin_same_name_documents_bins_when_requested() {
p.cargo("doc").arg("--bins"),
execs().with_status(0).with_stderr(&format!(
"\
[COMPILING] foo v0.0.1 ({dir})
[CHECKING] foo v0.0.1 ({dir})
[DOCUMENTING] foo v0.0.1 ({dir})
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
@ -1270,7 +1270,7 @@ fn doc_all_workspace() {
execs()
.with_status(0)
.with_stderr_contains("[..] Documenting bar v0.1.0 ([..])")
.with_stderr_contains("[..] Compiling bar v0.1.0 ([..])")
.with_stderr_contains("[..] Checking bar v0.1.0 ([..])")
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])"),
);
}

2
tests/testsuite/rustdoc.rs
View file

@ -109,7 +109,7 @@ fn rustdoc_foo_with_bar_dependency() {
foo.cargo("rustdoc").arg("-v").arg("--").arg("--cfg=foo"),
execs().with_status(0).with_stderr(format!(
"\
[COMPILING] bar v0.0.1 ([..])
[CHECKING] bar v0.0.1 ([..])
[RUNNING] `rustc [..]bar[/]src[/]lib.rs [..]`
[DOCUMENTING] foo v0.0.1 ({url})
[RUNNING] `rustdoc --crate-name foo src[/]lib.rs \