From 248dd14fa590b55b237098ff377e702e4d336bd1 Mon Sep 17 00:00:00 2001 From: SparrowLii Date: Tue, 31 Oct 2023 17:30:41 +0800 Subject: [PATCH] update config.example.toml --- config.example.toml | 9 +++++---- src/bootstrap/src/core/config/config.rs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.example.toml b/config.example.toml index 698e3d62ae4..4984cf8ba1e 100644 --- a/config.example.toml +++ b/config.example.toml @@ -553,10 +553,11 @@ change-id = 117435 # Whether to always use incremental compilation when building rustc #incremental = false -# Build a multi-threaded rustc -# FIXME(#75760): Some UI tests fail when this option is enabled. -# NOTE: This option is NOT SUPPORTED. See #48685. -#parallel-compiler = false +# Build a multi-threaded rustc. This allows users to use parallel rustc +# via the unstable option `-Z threads=n`. +# Since stable/beta channels only allow using stable features, +# `parallel-compiler = false` should be set for these channels. +#parallel-compiler = true # The default linker that will be hard-coded into the generated # compiler for targets that don't specify a default linker explicitly diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 95d34aaf285..a871399453e 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -1112,7 +1112,7 @@ fn get_toml(file: &Path) -> TomlConfig { fn parse_inner(args: &[String], get_toml: impl Fn(&Path) -> TomlConfig) -> Config { let mut flags = Flags::parse(&args); - let mut config: Config = Config::default_opts(); + let mut config = Config::default_opts(); // Set flags. config.paths = std::mem::take(&mut flags.paths);