Skip to content

Commit cd955f1

Browse files
author
Jonathan Turner
committed
Add 'Finished' line after compile finishes with compile timing and build type
1 parent f578ee5 commit cd955f1

29 files changed

+323
-31
lines changed

‎src/cargo/ops/cargo_rustc/job_queue.rs

+24
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ pub struct JobQueue<'a> {
3030
compiled: HashSet<&'a PackageId>,
3131
documented: HashSet<&'a PackageId>,
3232
counts: HashMap<&'a PackageId, usize>,
33+
is_release: bool,
34+
is_doc_all: bool,
3335
}
3436

3537
/// A helper structure for metadata about the state of a building package.
@@ -88,6 +90,8 @@ impl<'a> JobQueue<'a> {
8890
compiled: HashSet::new(),
8991
documented: HashSet::new(),
9092
counts: HashMap::new(),
93+
is_release: cx.build_config.release,
94+
is_doc_all: cx.build_config.doc_all,
9195
}
9296
}
9397

@@ -118,6 +122,8 @@ impl<'a> JobQueue<'a> {
118122

119123
fn drain_the_queue(&mut self, cx: &mut Context, scope: &Scope<'a>)
120124
-> CargoResult<()> {
125+
use std::time::Instant;
126+
121127
let mut queue = Vec::new();
122128
trace!("queue: {:#?}", self.queue);
123129

@@ -131,6 +137,7 @@ impl<'a> JobQueue<'a> {
131137
// successful and otherwise wait for pending work to finish if it failed
132138
// and then immediately return.
133139
let mut error = None;
140+
let start_time = Instant::now();
134141
loop {
135142
while error.is_none() && self.active < self.jobs {
136143
if !queue.is_empty() {
@@ -191,7 +198,24 @@ impl<'a> JobQueue<'a> {
191198
}
192199
}
193200

201+
let build_type = if self.is_release { "release" } else { "debug" };
202+
let profile = cx.lib_profile(cx.resolve.root());
203+
let mut opt_type = String::from(if profile.opt_level > 0 { "optimized" }
204+
else { "unoptimized" });
205+
if profile.debuginfo {
206+
opt_type = opt_type + " + debuginfo";
207+
}
208+
let duration = start_time.elapsed();
209+
let time_elapsed = format!("{}.{1:.2} secs",
210+
duration.as_secs(),
211+
duration.subsec_nanos() / 10000000);
194212
if self.queue.is_empty() {
213+
if !self.is_doc_all {
214+
try!(cx.config.shell().status("Finished", format!("{} [{}] target(s) in {}",
215+
build_type,
216+
opt_type,
217+
time_elapsed)));
218+
}
195219
Ok(())
196220
} else if let Some(e) = error {
197221
Err(e)

‎tests/bad-config.rs

+2
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ fn unused_keys() {
459459
execs().with_status(0).with_stderr("\
460460
warning: unused manifest key: target.foo.bar
461461
[COMPILING] foo v0.1.0 (file:///[..])
462+
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
462463
"));
463464
}
464465

@@ -509,5 +510,6 @@ invalid), but this file has a table header which does not have a newline after
509510
it. A newline needs to be added and this warning will soon become a hard error
510511
in the future.
511512
[COMPILING] empty_deps v0.0.0 ([..])
513+
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
512514
"));
513515
}

‎tests/bench.rs

+20-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ fn cargo_bench_simple() {
4242
assert_that(p.cargo("bench"),
4343
execs().with_stderr(&format!("\
4444
[COMPILING] foo v0.5.0 ({})
45+
[FINISHED] release [optimized] target(s) in [..]
4546
[RUNNING] target[..]release[..]foo-[..]", p.url()))
4647
.with_stdout("
4748
running 1 test
@@ -76,6 +77,7 @@ fn bench_tarname() {
7677
execs().with_status(0)
7778
.with_stderr(format!("\
7879
[COMPILING] foo v0.0.1 ({dir})
80+
[FINISHED] release [optimized] target(s) in [..]
7981
[RUNNING] target[..]release[..]bin2[..]
8082
", dir = prj.url()))
8183
.with_stdout("
@@ -104,6 +106,7 @@ fn cargo_bench_verbose() {
104106
execs().with_stderr(&format!("\
105107
[COMPILING] foo v0.5.0 ({url})
106108
[RUNNING] `rustc src[..]foo.rs [..]`
109+
[FINISHED] release [optimized] target(s) in [..]
107110
[RUNNING] `[..]target[..]release[..]foo-[..] hello --bench`", url = p.url()))
108111
.with_stdout("
109112
running 1 test
@@ -186,6 +189,7 @@ running 1 test
186189
test bench_hello ... ")
187190
.with_stderr_contains(format!("\
188191
[COMPILING] foo v0.5.0 ({})
192+
[FINISHED] release [optimized] target(s) in [..]
189193
[RUNNING] target[..]release[..]foo-[..]
190194
thread '[..]' panicked at 'assertion failed: \
191195
`(left == right)` (left: \
@@ -238,6 +242,7 @@ fn bench_with_lib_dep() {
238242
assert_that(p.cargo_process("bench"),
239243
execs().with_stderr(&format!("\
240244
[COMPILING] foo v0.0.1 ({})
245+
[FINISHED] release [optimized] target(s) in [..]
241246
[RUNNING] target[..]release[..]baz-[..]
242247
[RUNNING] target[..]release[..]foo-[..]", p.url()))
243248
.with_stdout("
@@ -301,6 +306,7 @@ fn bench_with_deep_lib_dep() {
301306
.with_stderr(&format!("\
302307
[COMPILING] foo v0.0.1 ([..])
303308
[COMPILING] bar v0.0.1 ({dir})
309+
[FINISHED] release [optimized] target(s) in [..]
304310
[RUNNING] target[..]", dir = p.url()))
305311
.with_stdout("
306312
running 1 test
@@ -346,6 +352,7 @@ fn external_bench_explicit() {
346352
assert_that(p.cargo_process("bench"),
347353
execs().with_stderr(&format!("\
348354
[COMPILING] foo v0.0.1 ({})
355+
[FINISHED] release [optimized] target(s) in [..]
349356
[RUNNING] target[..]release[..]bench-[..]
350357
[RUNNING] target[..]release[..]foo-[..]", p.url()))
351358
.with_stdout("
@@ -395,6 +402,7 @@ fn external_bench_implicit() {
395402
assert_that(p.cargo_process("bench"),
396403
execs().with_stderr(&format!("\
397404
[COMPILING] foo v0.0.1 ({})
405+
[FINISHED] release [optimized] target(s) in [..]
398406
[RUNNING] target[..]release[..]external-[..]
399407
[RUNNING] target[..]release[..]foo-[..]", p.url()))
400408
.with_stdout("
@@ -455,6 +463,7 @@ fn pass_through_command_line() {
455463
execs().with_status(0)
456464
.with_stderr(&format!("\
457465
[COMPILING] foo v0.0.1 ({dir})
466+
[FINISHED] release [optimized] target(s) in [..]
458467
[RUNNING] target[..]release[..]foo-[..]", dir = p.url()))
459468
.with_stdout("
460469
running 1 test
@@ -466,7 +475,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
466475

467476
assert_that(p.cargo("bench").arg("foo"),
468477
execs().with_status(0)
469-
.with_stderr("\
478+
.with_stderr("[FINISHED] release [optimized] target(s) in [..]
470479
[RUNNING] target[..]release[..]foo-[..]")
471480
.with_stdout("
472481
running 1 test
@@ -536,6 +545,7 @@ fn lib_bin_same_name() {
536545
assert_that(p.cargo_process("bench"),
537546
execs().with_stderr(&format!("\
538547
[COMPILING] foo v0.0.1 ({})
548+
[FINISHED] release [optimized] target(s) in [..]
539549
[RUNNING] target[..]release[..]foo-[..]
540550
[RUNNING] target[..]release[..]foo-[..]", p.url()))
541551
.with_stdout("
@@ -589,6 +599,7 @@ fn lib_with_standard_name() {
589599
execs().with_status(0)
590600
.with_stderr(&format!("\
591601
[COMPILING] syntax v0.0.1 ({dir})
602+
[FINISHED] release [optimized] target(s) in [..]
592603
[RUNNING] target[..]release[..]bench-[..]
593604
[RUNNING] target[..]release[..]syntax-[..]", dir = p.url()))
594605
.with_stdout("
@@ -640,6 +651,7 @@ fn lib_with_standard_name2() {
640651
execs().with_status(0)
641652
.with_stderr(&format!("\
642653
[COMPILING] syntax v0.0.1 ({dir})
654+
[FINISHED] release [optimized] target(s) in [..]
643655
[RUNNING] target[..]release[..]syntax-[..]", dir = p.url()))
644656
.with_stdout("
645657
running 1 test
@@ -709,6 +721,7 @@ fn bench_dylib() {
709721
[RUNNING] [..] -C opt-level=3 [..]
710722
[RUNNING] [..] -C opt-level=3 [..]
711723
[RUNNING] [..] -C opt-level=3 [..]
724+
[FINISHED] release [optimized] target(s) in [..]
712725
[RUNNING] [..]target[..]release[..]bench-[..]
713726
[RUNNING] [..]target[..]release[..]foo-[..]", dir = p.url()))
714727
.with_stdout("
@@ -730,6 +743,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
730743
.with_stderr(&format!("\
731744
[FRESH] bar v0.0.1 ({dir}/bar)
732745
[FRESH] foo v0.0.1 ({dir})
746+
[FINISHED] release [optimized] target(s) in [..]
733747
[RUNNING] [..]target[..]release[..]bench-[..]
734748
[RUNNING] [..]target[..]release[..]foo-[..]", dir = p.url()))
735749
.with_stdout("
@@ -771,6 +785,7 @@ fn bench_twice_with_build_cmd() {
771785
execs().with_status(0)
772786
.with_stderr(&format!("\
773787
[COMPILING] foo v0.0.1 ({dir})
788+
[FINISHED] release [optimized] target(s) in [..]
774789
[RUNNING] target[..]release[..]foo-[..]", dir = p.url()))
775790
.with_stdout("
776791
running 1 test
@@ -782,7 +797,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
782797

783798
assert_that(p.cargo("bench"),
784799
execs().with_status(0)
785-
.with_stderr("\
800+
.with_stderr("[FINISHED] release [optimized] target(s) in [..]
786801
[RUNNING] target[..]release[..]foo-[..]")
787802
.with_stdout("
788803
running 1 test
@@ -855,6 +870,7 @@ fn bench_with_examples() {
855870
[RUNNING] `rustc [..]`
856871
[RUNNING] `rustc [..]`
857872
[RUNNING] `rustc [..]`
873+
[FINISHED] release [optimized] target(s) in [..]
858874
[RUNNING] `{dir}[..]target[..]release[..]testb1-[..] --bench`
859875
[RUNNING] `{dir}[..]target[..]release[..]testbench-[..] --bench`",
860876
dir = p.root().display(), url = p.url()))
@@ -903,6 +919,7 @@ fn test_a_bench() {
903919
execs().with_status(0)
904920
.with_stderr("\
905921
[COMPILING] foo v0.1.0 ([..])
922+
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
906923
[RUNNING] target[..]debug[..]b-[..]")
907924
.with_stdout("
908925
running 1 test
@@ -940,6 +957,7 @@ fn test_bench_no_run() {
940957
execs().with_status(0)
941958
.with_stderr("\
942959
[COMPILING] foo v0.1.0 ([..])
960+
[FINISHED] release [optimized] target(s) in [..]
943961
"));
944962
}
945963

‎tests/build-lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
1414
--emit=dep-info,link \
1515
-L dependency={dir}{sep}target{sep}debug \
1616
-L dependency={dir}{sep}target{sep}debug{sep}deps`
17+
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
1718
", sep = SEP,
1819
dir = p.root().display(), url = p.url(),
1920
name = "foo", version = "0.0.1")

0 commit comments

Comments
 (0)