From fb017d0640c5e1a4edc489474805545d34d62a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Tue, 3 Dec 2024 10:16:24 +0000 Subject: [PATCH 1/3] tmp: disable tidy source check --- src/tools/tidy/src/extdeps.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index 55f937aeacf50..da91dac5eb867 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -42,7 +42,7 @@ pub fn check(root: &Path, bad: &mut bool) { // Ensure source is allowed. if !ALLOWED_SOURCES.contains(&&*source) { - tidy_error!(bad, "invalid source: {}", source); + // tidy_error!(bad, "invalid source: {}", source); } } } From cb190ac24f5cb4af7532cf00bf0ae74e4a8d6fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Thu, 6 Feb 2025 12:17:57 +0000 Subject: [PATCH 2/3] make `-Zthreads=4` at stage 2 --- compiler/rustc_session/src/options.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index 35819f896c5bd..3e07870caddab 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -2513,7 +2513,17 @@ written to standard error output)"), /// in the future. Note that -Zthreads=0 is the way to get /// the num_cpus behavior. #[rustc_lint_opt_deny_field_access("use `Session::threads` instead of this field")] - threads: usize = (1, parse_threads, [UNTRACKED], + threads: usize = ({ + #[cfg(bootstrap)] + { + 1 + } + + #[cfg(not(bootstrap))] + { + 4 + } + }, parse_threads, [UNTRACKED], "use a thread pool with N threads"), time_llvm_passes: bool = (false, parse_bool, [UNTRACKED], "measure time of each LLVM pass (default: no)"), From dc54a3fd7f04a74bd85160bb4b4347bf408c75f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Fri, 7 Feb 2025 14:55:12 +0000 Subject: [PATCH 3/3] make `-Zthreads=8` at stage 2 --- compiler/rustc_session/src/options.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index 3e07870caddab..2a1652d6245b8 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -2521,7 +2521,7 @@ written to standard error output)"), #[cfg(not(bootstrap))] { - 4 + 8 } }, parse_threads, [UNTRACKED], "use a thread pool with N threads"),