Skip to content

Commit 4229175

Browse files
committed
remove debug-logging default from tools profile
`debug-logging` conflicts with `download-rustc` option, and doesn't really make sense to enable it for a profile that is used for tool development. Signed-off-by: onur-ozkan <[email protected]>
1 parent 0c5864f commit 4229175

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/bootstrap/defaults/config.tools.toml

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# These defaults are meant for contributors to tools which build on the
22
# compiler, but do not modify it directly.
33
[rust]
4-
# This enables `RUSTC_LOG=debug`, avoiding confusing situations
5-
# where adding `debug!()` appears to do nothing.
6-
# However, it makes running the compiler slightly slower.
7-
debug-logging = true
84
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
95
incremental = true
106
# Download rustc from CI instead of building it from source.

src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
200200
severity: ChangeSeverity::Warning,
201201
summary: "`llvm.lld` is enabled by default for the dist profile. If set to false, `lld` will not be included in the dist build.",
202202
},
203+
ChangeInfo {
204+
change_id: 127913,
205+
severity: ChangeSeverity::Warning,
206+
summary: "`debug-logging` option has been removed from the default `tools` profile.",
207+
},
203208
];

src/ci/docker/host-x86_64/mingw-check/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
4747
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
4848
ENV SCRIPT python3 ../x.py check --stage 0 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \
4949
# Ensure that default config profiles are not broken
50-
for config_file in ../src/bootstrap/defaults/*.toml; do python3 ../x.py build --dry-run --config "$config_file"; done
50+
for config_file in ../src/bootstrap/defaults/*.toml; do python3 ../x.py build --dry-run --config "$config_file"; done && \
5151
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
5252
python3 ../x.py clippy bootstrap -Dwarnings && \
5353
python3 ../x.py clippy compiler library -Aclippy::all -Dclippy::correctness && \

0 commit comments

Comments
 (0)