Skip to content

Commit af212d5

Browse files
borsbors
committed
Auto merge of #8837 - bjorn3:improve_perf, r=alexcrichton
Improve performance of almost fresh builds This currently saves about 15ms out of the 170ms Cargo overhead when compiling Bevy. part of #8833 <details><summary>Benchmark results as of <a href="https://github.com/rust-lang/cargo/commit/602a1bd7f5a0da9878952f492508aca5eddd1c53"><code>602a1bd</code></a></summary> Completely fresh: ``` $ RUSTC=$(rustup which rustc) hyperfine --warmup 10 --runs 100 "../../cargo/cargo_master build --release --example breakout" "../../cargo/cargo_improve_perf build --release --example breakout" Benchmark #1: ../../cargo/cargo_master build --release --example breakout Time (mean ± σ): 613.8 ms ± 509.1 ms [User: 147.6 ms, System: 38.4 ms] Range (min … max): 170.8 ms … 1199.2 ms 100 runs Warning: Statistical outliers were detected. Consider re-running this benchmark on a quiet PC without any interferences from other programs. It might help to use the '--warmup' or '--prepare' options. Benchmark #2: ../../cargo/cargo_improve_perf build --release --example breakout Time (mean ± σ): 164.2 ms ± 0.8 ms [User: 137.0 ms, System: 27.1 ms] Range (min … max): 162.8 ms … 169.6 ms 100 runs Summary '../../cargo/cargo_improve_perf build --release --example breakout' ran 3.74 ± 3.10 times faster than '../../cargo/cargo_master build --release --example breakout' ``` (statistical outliers are consistently reproducible and don't happen for any other benchmarks) ``` $ RUSTC=$(rustup which rustc) perf stat -r10 ../../cargo/cargo_master build --release --example breakout Finished release [optimized] target(s) in 0.16s [...] Finished release [optimized] target(s) in 0.16s Performance counter stats for '../../cargo/cargo_master build --release --example breakout' (10 runs): 192,95 msec task-clock:u # 0,242 CPUs utilized ( +- 0,69% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 4926 page-faults:u # 0,026 M/sec ( +- 0,11% ) 387516813 cycles:u # 2,008 GHz ( +- 0,69% ) 685141858 instructions:u # 1,77 insn per cycle ( +- 0,04% ) 124443483 branches:u # 644,958 M/sec ( +- 0,05% ) 2726944 branch-misses:u # 2,19% of all branches ( +- 0,10% ) 0,796 +- 0,168 seconds time elapsed ( +- 21,06% ) $ RUSTC=$(rustup which rustc) perf stat -r10 ../../cargo/cargo_improve_perf build --release --example breakout Finished release [optimized] target(s) in 0.14s [...] Finished release [optimized] target(s) in 0.15s Performance counter stats for '../../cargo/cargo_improve_perf build --release --example breakout' (10 runs): 168,78 msec task-clock:u # 0,997 CPUs utilized ( +- 0,56% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 4075 page-faults:u # 0,024 M/sec ( +- 0,16% ) 372565970 cycles:u # 2,207 GHz ( +- 0,61% ) 667356921 instructions:u # 1,79 insn per cycle ( +- 0,03% ) 120170432 branches:u # 712,010 M/sec ( +- 0,04% ) 2642670 branch-misses:u # 2,20% of all branches ( +- 0,12% ) 0,169294 +- 0,000933 seconds time elapsed ( +- 0,55% ) ``` Need to recompile single executable: ``` $ RUSTC=$(rustup which rustc) hyperfine --warmup 10 --runs 100 "touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout" "touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf build --release --example breakout" Benchmark #1: touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout Time (mean ± σ): 658.9 ms ± 1.8 ms [User: 538.6 ms, System: 181.1 ms] Range (min … max): 655.5 ms … 668.8 ms 100 runs Benchmark #2: touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf build --release --example breakout Time (mean ± σ): 648.6 ms ± 2.1 ms [User: 534.7 ms, System: 162.6 ms] Range (min … max): 645.2 ms … 659.5 ms 100 runs Summary 'touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf build --release --example breakout' ran 1.02 ± 0.00 times faster than 'touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout' ``` ``` $ RUSTC=$(rustup which rustc) perf stat -r10 --no-inherit --pre "touch examples/game/breakout.rs" ../../cargo/cargo_master build --release --example breakout Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.67s [...] Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.66s Performance counter stats for '../../cargo/cargo_master build --release --example breakout' (10 runs): 183,65 msec task-clock:u # 0,265 CPUs utilized ( +- 1,08% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 6603 page-faults:u # 0,036 M/sec ( +- 0,11% ) 382629371 cycles:u # 2,083 GHz ( +- 0,79% ) 673192095 instructions:u # 1,76 insn per cycle ( +- 0,03% ) 121518254 branches:u # 661,688 M/sec ( +- 0,04% ) 2698503 branch-misses:u # 2,22% of all branches ( +- 0,18% ) 0,69376 +- 0,00274 seconds time elapsed ( +- 0,39% ) $ RUSTC=$(rustup which rustc) perf stat -r10 --no-inherit --pre "touch examples/game/breakout.rs" ../../cargo/cargo_improve_perf build --release --example breakout Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.66s [...] Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.76s Performance counter stats for '../../cargo/cargo_improve_perf build --release --example breakout' (10 runs): 177,03 msec task-clock:u # 0,256 CPUs utilized ( +- 1,70% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 5774 page-faults:u # 0,033 M/sec ( +- 0,14% ) 381121369 cycles:u # 2,153 GHz ( +- 1,29% ) 672129390 instructions:u # 1,76 insn per cycle ( +- 0,03% ) 121248111 branches:u # 684,900 M/sec ( +- 0,04% ) 2672832 branch-misses:u # 2,20% of all branches ( +- 0,34% ) 0,6924 +- 0,0148 seconds time elapsed ( +- 2,13% ) ``` </details> <details><summary>Benchmark results as of <a href="https://github.com/rust-lang/cargo/commit/ba49b13e65fd487b8fc1761456c34e8d9feefb0e"><code>ba49b13</code></a></summary> Completely fresh: ``` $ RUSTC=$(rustup which rustc) hyperfine --warmup 10 --runs 100 "../../cargo/cargo_master build --release --example breakout" "../../cargo/cargo_improve_perf2 build --release --example breakout" Benchmark #1: ../../cargo/cargo_master build --release --example breakout Time (mean ± σ): 635.4 ms ± 511.6 ms [User: 146.2 ms, System: 41.1 ms] Range (min … max): 172.0 ms … 1208.7 ms 100 runs Warning: Statistical outliers were detected. Consider re-running this benchmark on a quiet PC without any interferences from other programs. It might help to use the '--warmup' or '--prepare' options. Benchmark #2: ../../cargo/cargo_improve_perf2 build --release --example breakout Time (mean ± σ): 165.3 ms ± 1.2 ms [User: 137.2 ms, System: 28.0 ms] Range (min … max): 163.7 ms … 171.0 ms 100 runs Summary '../../cargo/cargo_improve_perf2 build --release --example breakout' ran 3.84 ± 3.09 times faster than '../../cargo/cargo_master build --release --example breakout' ``` (statistical outliers are consistently reproducible and don't happen for any other benchmarks) ``` $ RUSTC=$(rustup which rustc) perf stat -r10 ../../cargo/cargo_master build --release --example breakout Finished release [optimized] target(s) in 0.16s [...] Finished release [optimized] target(s) in 0.16s Performance counter stats for '../../cargo/cargo_master build --release --example breakout' (10 runs): 197,21 msec task-clock:u # 0,220 CPUs utilized ( +- 0,79% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 4918 page-faults:u # 0,025 M/sec ( +- 0,09% ) 395214529 cycles:u # 2,004 GHz ( +- 0,71% ) 685707083 instructions:u # 1,74 insn per cycle ( +- 0,04% ) 124571038 branches:u # 631,667 M/sec ( +- 0,05% ) 2748386 branch-misses:u # 2,21% of all branches ( +- 0,35% ) 0,897 +- 0,155 seconds time elapsed ( +- 17,32% ) $ RUSTC=$(rustup which rustc) perf stat -r10 ../../cargo/cargo_improve_perf2 build --release --example breakout Finished release [optimized] target(s) in 0.14s [...] Finished release [optimized] target(s) in 0.15s Performance counter stats for '../../cargo/cargo_improve_perf2 build --release --example breakout' (10 runs): 168,28 msec task-clock:u # 0,621 CPUs utilized ( +- 0,51% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 4086 page-faults:u # 0,024 M/sec ( +- 0,15% ) 371029906 cycles:u # 2,205 GHz ( +- 0,48% ) 667493108 instructions:u # 1,80 insn per cycle ( +- 0,02% ) 120202436 branches:u # 714,308 M/sec ( +- 0,03% ) 2659209 branch-misses:u # 2,21% of all branches ( +- 0,13% ) 0,271 +- 0,103 seconds time elapsed ( +- 37,82% ) ``` Need to recompile single executable: ``` $ RUSTC=$(rustup which rustc) hyperfine --warmup 10 --runs 100 "touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout" "touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf2 build --release --example breakout" Benchmark #1: touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout Time (mean ± σ): 660.7 ms ± 2.9 ms [User: 545.6 ms, System: 175.2 ms] Range (min … max): 656.2 ms … 675.1 ms 100 runs Benchmark #2: touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf2 build --release --example breakout Time (mean ± σ): 650.2 ms ± 5.3 ms [User: 542.9 ms, System: 156.0 ms] Range (min … max): 645.9 ms … 687.7 ms 100 runs Warning: Statistical outliers were detected. Consider re-running this benchmark on a quiet PC without any interferences from other programs. It might help to use the '--warmup' or '--prepare' options. Summary 'touch examples/game/breakout.rs && ../../cargo/cargo_improve_perf2 build --release --example breakout' ran 1.02 ± 0.01 times faster than 'touch examples/game/breakout.rs && ../../cargo/cargo_master build --release --example breakout' ``` ``` $ RUSTC=$(rustup which rustc) perf stat -r10 --no-inherit --pre "touch examples/game/breakout.rs" ../../cargo/cargo_master build --release --example breakout Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.65s [...] Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.66s Performance counter stats for '../../cargo/cargo_master build --release --example breakout' (10 runs): 181,52 msec task-clock:u # 0,264 CPUs utilized ( +- 0,29% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 6618 page-faults:u # 0,036 M/sec ( +- 0,09% ) 381324766 cycles:u # 2,101 GHz ( +- 0,21% ) 673170130 instructions:u # 1,77 insn per cycle ( +- 0,03% ) 121511051 branches:u # 669,422 M/sec ( +- 0,04% ) 2700116 branch-misses:u # 2,22% of all branches ( +- 0,17% ) 0,68766 +- 0,00293 seconds time elapsed ( +- 0,43% ) $ RUSTC=$(rustup which rustc) perf stat -r10 --no-inherit --pre "touch examples/game/breakout.rs" ../../cargo/cargo_improve_perf2 build --release --example breakout Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.64s [...] Compiling bevy v0.3.0 (/home/bjorn/Documenten/cg_clif3/bevy) Finished release [optimized] target(s) in 0.64s Performance counter stats for '../../cargo/cargo_improve_perf2 build --release --example breakout' (10 runs): 173,78 msec task-clock:u # 0,257 CPUs utilized ( +- 0,65% ) 0 context-switches:u # 0,000 K/sec 0 cpu-migrations:u # 0,000 K/sec 5772 page-faults:u # 0,033 M/sec ( +- 0,17% ) 378994346 cycles:u # 2,181 GHz ( +- 0,62% ) 672499584 instructions:u # 1,77 insn per cycle ( +- 0,04% ) 121341331 branches:u # 698,266 M/sec ( +- 0,05% ) 2691563 branch-misses:u # 2,22% of all branches ( +- 0,17% ) 0,67554 +- 0,00641 seconds time elapsed ( +- 0,95% ) ``` </summary>
2 parents 1fc3700 + 50c0221 commit af212d5

File tree

5 files changed

+97
-40
lines changed

5 files changed

+97
-40
lines changed

‎src/cargo/core/compiler/custom_build.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn emit_build_output(
128128
output: &BuildOutput,
129129
out_dir: &Path,
130130
package_id: PackageId,
131-
) {
131+
) -> CargoResult<()> {
132132
let library_paths = output
133133
.library_paths
134134
.iter()
@@ -144,7 +144,8 @@ fn emit_build_output(
144144
out_dir,
145145
}
146146
.to_json_string();
147-
state.stdout(msg);
147+
state.stdout(msg)?;
148+
Ok(())
148149
}
149150

150151
fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
@@ -353,13 +354,13 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
353354
warnings_in_case_of_panic.push(warning.to_owned());
354355
}
355356
if extra_verbose {
356-
state.stdout(format!("{}{}", prefix, stdout));
357+
state.stdout(format!("{}{}", prefix, stdout))?;
357358
}
358359
Ok(())
359360
},
360361
&mut |stderr| {
361362
if extra_verbose {
362-
state.stderr(format!("{}{}", prefix, stderr));
363+
state.stderr(format!("{}{}", prefix, stderr))?;
363364
}
364365
Ok(())
365366
},
@@ -396,7 +397,7 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
396397
BuildOutput::parse(&output.stdout, &pkg_name, &script_out_dir, &script_out_dir)?;
397398

398399
if json_messages {
399-
emit_build_output(state, &parsed_output, script_out_dir.as_path(), id);
400+
emit_build_output(state, &parsed_output, script_out_dir.as_path(), id)?;
400401
}
401402
build_script_outputs
402403
.lock()
@@ -421,7 +422,7 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
421422
};
422423

423424
if json_messages {
424-
emit_build_output(state, &output, script_out_dir.as_path(), id);
425+
emit_build_output(state, &output, script_out_dir.as_path(), id)?;
425426
}
426427

427428
build_script_outputs
@@ -432,7 +433,7 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
432433
});
433434

434435
let mut job = if cx.bcx.build_config.build_plan {
435-
Job::new(Work::noop(), Freshness::Dirty)
436+
Job::new_dirty(Work::noop())
436437
} else {
437438
fingerprint::prepare_target(cx, unit, false)?
438439
};

‎src/cargo/core/compiler/fingerprint.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,7 @@ use crate::util::paths;
337337
use crate::util::{internal, profile, ProcessBuilder};
338338

339339
use super::custom_build::BuildDeps;
340-
use super::job::{
341-
Freshness::{Dirty, Fresh},
342-
Job, Work,
343-
};
340+
use super::job::{Job, Work};
344341
use super::{BuildContext, Context, FileFlavor, Unit};
345342

346343
/// Determines if a `unit` is up-to-date, and if not prepares necessary work to
@@ -396,7 +393,7 @@ pub fn prepare_target(cx: &mut Context<'_, '_>, unit: &Unit, force: bool) -> Car
396393
}
397394

398395
if compare.is_ok() && !force {
399-
return Ok(Job::new(Work::noop(), Fresh));
396+
return Ok(Job::new_fresh());
400397
}
401398

402399
// Clear out the old fingerprint file if it exists. This protects when
@@ -469,7 +466,7 @@ pub fn prepare_target(cx: &mut Context<'_, '_>, unit: &Unit, force: bool) -> Car
469466
Work::new(move |_| write_fingerprint(&loc, &fingerprint))
470467
};
471468

472-
Ok(Job::new(write_fingerprint, Dirty))
469+
Ok(Job::new_dirty(write_fingerprint))
473470
}
474471

475472
/// Dependency edge information for fingerprints. This is generated for each

‎src/cargo/core/compiler/job.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,20 @@ impl Work {
4040
}
4141

4242
impl Job {
43+
/// Creates a new job that does nothing.
44+
pub fn new_fresh() -> Job {
45+
Job {
46+
work: Work::noop(),
47+
fresh: Freshness::Fresh,
48+
}
49+
}
50+
4351
/// Creates a new job representing a unit of work.
44-
pub fn new(work: Work, fresh: Freshness) -> Job {
45-
Job { work, fresh }
52+
pub fn new_dirty(work: Work) -> Job {
53+
Job {
54+
work,
55+
fresh: Freshness::Dirty,
56+
}
4657
}
4758

4859
/// Consumes this job by running it, returning the result of the

‎src/cargo/core/compiler/job_queue.rs

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,30 @@ impl std::fmt::Display for JobId {
162162
}
163163
}
164164

165+
/// A `JobState` is constructed by `JobQueue::run` and passed to `Job::run`. It includes everything
166+
/// necessary to communicate between the main thread and the execution of the job.
167+
///
168+
/// The job may execute on either a dedicated thread or the main thread. If the job executes on the
169+
/// main thread, the `output` field must be set to prevent a deadlock.
165170
pub struct JobState<'a> {
166171
/// Channel back to the main thread to coordinate messages and such.
172+
///
173+
/// When the `output` field is `Some`, care must be taken to avoid calling `push_bounded` on
174+
/// the message queue to prevent a deadlock.
167175
messages: Arc<Queue<Message>>,
168176

177+
/// Normally output is sent to the job queue with backpressure. When the job is fresh
178+
/// however we need to immediately display the output to prevent a deadlock as the
179+
/// output messages are processed on the same thread as they are sent from. `output`
180+
/// defines where to output in this case.
181+
///
182+
/// Currently the `Shell` inside `Config` is wrapped in a `RefCell` and thus can't be passed
183+
/// between threads. This means that it isn't possible for multiple output messages to be
184+
/// interleaved. In the future, it may be wrapped in a `Mutex` instead. In this case
185+
/// interleaving is still prevented as the lock would be held for the whole printing of an
186+
/// output message.
187+
output: Option<&'a Config>,
188+
169189
/// The job id that this state is associated with, used when sending
170190
/// messages back to the main thread.
171191
id: JobId,
@@ -231,12 +251,24 @@ impl<'a> JobState<'a> {
231251
.push(Message::BuildPlanMsg(module_name, cmd, filenames));
232252
}
233253

234-
pub fn stdout(&self, stdout: String) {
235-
self.messages.push_bounded(Message::Stdout(stdout));
254+
pub fn stdout(&self, stdout: String) -> CargoResult<()> {
255+
if let Some(config) = self.output {
256+
writeln!(config.shell().out(), "{}", stdout)?;
257+
} else {
258+
self.messages.push_bounded(Message::Stdout(stdout));
259+
}
260+
Ok(())
236261
}
237262

238-
pub fn stderr(&self, stderr: String) {
239-
self.messages.push_bounded(Message::Stderr(stderr));
263+
pub fn stderr(&self, stderr: String) -> CargoResult<()> {
264+
if let Some(config) = self.output {
265+
let mut shell = config.shell();
266+
shell.print_ansi(stderr.as_bytes())?;
267+
shell.err().write_all(b"\n")?;
268+
} else {
269+
self.messages.push_bounded(Message::Stderr(stderr));
270+
}
271+
Ok(())
240272
}
241273

242274
/// A method used to signal to the coordinator thread that the rmeta file
@@ -826,16 +858,9 @@ impl<'cfg> DrainState<'cfg> {
826858
self.note_working_on(cx.bcx.config, unit, fresh)?;
827859
}
828860

829-
let doit = move || {
830-
let state = JobState {
831-
id,
832-
messages: messages.clone(),
833-
rmeta_required: Cell::new(rmeta_required),
834-
_marker: marker::PhantomData,
835-
};
836-
861+
let doit = move |state: JobState<'_>| {
837862
let mut sender = FinishOnDrop {
838-
messages: &messages,
863+
messages: &state.messages,
839864
id,
840865
result: None,
841866
};
@@ -854,7 +879,9 @@ impl<'cfg> DrainState<'cfg> {
854879
// we need to make sure that the metadata is flagged as produced so
855880
// send a synthetic message here.
856881
if state.rmeta_required.get() && sender.result.as_ref().unwrap().is_ok() {
857-
messages.push(Message::Finish(id, Artifact::Metadata, Ok(())));
882+
state
883+
.messages
884+
.push(Message::Finish(state.id, Artifact::Metadata, Ok(())));
858885
}
859886

860887
// Use a helper struct with a `Drop` implementation to guarantee
@@ -880,10 +907,31 @@ impl<'cfg> DrainState<'cfg> {
880907
};
881908

882909
match fresh {
883-
Freshness::Fresh => self.timings.add_fresh(),
884-
Freshness::Dirty => self.timings.add_dirty(),
910+
Freshness::Fresh => {
911+
self.timings.add_fresh();
912+
// Running a fresh job on the same thread is often much faster than spawning a new
913+
// thread to run the job.
914+
doit(JobState {
915+
id,
916+
messages: messages.clone(),
917+
output: Some(cx.bcx.config),
918+
rmeta_required: Cell::new(rmeta_required),
919+
_marker: marker::PhantomData,
920+
});
921+
}
922+
Freshness::Dirty => {
923+
self.timings.add_dirty();
924+
scope.spawn(move |_| {
925+
doit(JobState {
926+
id,
927+
messages: messages.clone(),
928+
output: None,
929+
rmeta_required: Cell::new(rmeta_required),
930+
_marker: marker::PhantomData,
931+
})
932+
});
933+
}
885934
}
886-
scope.spawn(move |_| doit());
887935

888936
Ok(())
889937
}

‎src/cargo/core/compiler/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ fn compile<'cfg>(
130130
custom_build::prepare(cx, unit)?
131131
} else if unit.mode.is_doc_test() {
132132
// We run these targets later, so this is just a no-op for now.
133-
Job::new(Work::noop(), Freshness::Fresh)
133+
Job::new_fresh()
134134
} else if build_plan {
135-
Job::new(rustc(cx, unit, &exec.clone())?, Freshness::Dirty)
135+
Job::new_dirty(rustc(cx, unit, &exec.clone())?)
136136
} else {
137137
let force = exec.force_rebuild(unit) || force_rebuild;
138138
let mut job = fingerprint::prepare_target(cx, unit, force)?;
@@ -448,7 +448,7 @@ fn link_targets(cx: &mut Context<'_, '_>, unit: &Unit, fresh: bool) -> CargoResu
448448
fresh,
449449
}
450450
.to_json_string();
451-
state.stdout(msg);
451+
state.stdout(msg)?;
452452
}
453453
Ok(())
454454
}))
@@ -1139,7 +1139,7 @@ fn on_stdout_line(
11391139
_package_id: PackageId,
11401140
_target: &Target,
11411141
) -> CargoResult<()> {
1142-
state.stdout(line.to_string());
1142+
state.stdout(line.to_string())?;
11431143
Ok(())
11441144
}
11451145

@@ -1177,7 +1177,7 @@ fn on_stderr_line_inner(
11771177
// something like that), so skip over everything that doesn't look like a
11781178
// JSON message.
11791179
if !line.starts_with('{') {
1180-
state.stderr(line.to_string());
1180+
state.stderr(line.to_string())?;
11811181
return Ok(true);
11821182
}
11831183

@@ -1189,7 +1189,7 @@ fn on_stderr_line_inner(
11891189
// to stderr.
11901190
Err(e) => {
11911191
debug!("failed to parse json: {:?}", e);
1192-
state.stderr(line.to_string());
1192+
state.stderr(line.to_string())?;
11931193
return Ok(true);
11941194
}
11951195
};
@@ -1225,7 +1225,7 @@ fn on_stderr_line_inner(
12251225
.map(|v| String::from_utf8(v).expect("utf8"))
12261226
.expect("strip should never fail")
12271227
};
1228-
state.stderr(rendered);
1228+
state.stderr(rendered)?;
12291229
return Ok(true);
12301230
}
12311231
}
@@ -1316,7 +1316,7 @@ fn on_stderr_line_inner(
13161316
// Switch json lines from rustc/rustdoc that appear on stderr to stdout
13171317
// instead. We want the stdout of Cargo to always be machine parseable as
13181318
// stderr has our colorized human-readable messages.
1319-
state.stdout(msg);
1319+
state.stdout(msg)?;
13201320
Ok(true)
13211321
}
13221322

0 commit comments

Comments
 (0)