diff options
| author | bors <bors@rust-lang.org> | 2023-03-18 11:19:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-18 11:19:30 +0000 |
| commit | f177b7cb91acd9debd1ed974e6521edb2ab6b097 (patch) | |
| tree | 19401efe737d61d8b2ac9fac15cce45dd9ba3cfe /src/bootstrap | |
| parent | df61fcaec1fdd3b949a7721abfaf37a8ca6e144c (diff) | |
| parent | 49a152885d6050529f2d71645564c73e205f9da6 (diff) | |
| download | rust-f177b7cb91acd9debd1ed974e6521edb2ab6b097.tar.gz rust-f177b7cb91acd9debd1ed974e6521edb2ab6b097.zip | |
Auto merge of #109303 - matthiaskrgr:rollup-usj4ef5, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #107416 (Error code E0794 for late-bound lifetime parameter error.) - #108772 (Speed up tidy quite a lot) - #109193 (Add revisions for -Zlower-impl-trait-in-trait-to-assoc-ty fixed tests) - #109234 (Tweak implementation of overflow checking assertions) - #109238 (Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty) - #109283 (rustdoc: reduce allocations in `visibility_to_src_with_space`) - #109287 (Use `size_of_val` instead of manual calculation) - #109288 (Stabilise `unix_socket_abstract`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index f5d680df113..baddc9da48d 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1118,7 +1118,11 @@ impl Step for Tidy { cmd.arg(&builder.src); cmd.arg(&builder.initial_cargo); cmd.arg(&builder.out); - cmd.arg(builder.jobs().to_string()); + // Tidy is heavily IO constrained. Still respect `-j`, but use a higher limit if `jobs` hasn't been configured. + let jobs = builder.config.jobs.unwrap_or_else(|| { + 8 * std::thread::available_parallelism().map_or(1, std::num::NonZeroUsize::get) as u32 + }); + cmd.arg(jobs.to_string()); if builder.is_verbose() { cmd.arg("--verbose"); } |
