Skip to content

Commit 37ebd22

Browse files
committed
Auto merge of rust-lang#113382 - lqd:test-mcp510, r=<try>
[perf] test MCP510 r? `@ghost`
2 parents 64e06c0 + dc54a3f commit 37ebd22

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

compiler/rustc_session/src/options.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -2513,7 +2513,17 @@ written to standard error output)"),
25132513
/// in the future. Note that -Zthreads=0 is the way to get
25142514
/// the num_cpus behavior.
25152515
#[rustc_lint_opt_deny_field_access("use `Session::threads` instead of this field")]
2516-
threads: usize = (1, parse_threads, [UNTRACKED],
2516+
threads: usize = ({
2517+
#[cfg(bootstrap)]
2518+
{
2519+
1
2520+
}
2521+
2522+
#[cfg(not(bootstrap))]
2523+
{
2524+
8
2525+
}
2526+
}, parse_threads, [UNTRACKED],
25172527
"use a thread pool with N threads"),
25182528
time_llvm_passes: bool = (false, parse_bool, [UNTRACKED],
25192529
"measure time of each LLVM pass (default: no)"),

src/tools/tidy/src/extdeps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub fn check(root: &Path, bad: &mut bool) {
4242

4343
// Ensure source is allowed.
4444
if !ALLOWED_SOURCES.contains(&&*source) {
45-
tidy_error!(bad, "invalid source: {}", source);
45+
// tidy_error!(bad, "invalid source: {}", source);
4646
}
4747
}
4848
}

0 commit comments

Comments
 (0)