bootstrap: support target specific config overrides

[weihanglo]

Can't find any previous discussion about not supporting this,
so I get it done.

The motivation of this is from #125473 (comment).

[rustbot]

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[rustbot]

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

[weihanglo]

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This doesn't really change any schema of config.toml, so probably don't need to update? Not sure though.

[onur-ozkan]

This doesn't really change any schema of config.toml, so probably don't need to update? Not sure though.

Yeah, update isn't needed for this.

[onur-ozkan]

Feel free to r=me once the CI is green.

r? onur-ozkan

[weihanglo]

Thanks for the review!

@bors r=onur-ozkan rollup

[bors]

📌 Commit d1f0bc7 has been approved by onur-ozkan

It is now in the queue for this repository.

[workingjubilee]

This is the only one that seems like it can explain the failure in fixes_missing_ampersand: #125533 (comment)

but I still don't know how...

@bors rollup=iffy

[Urgau]

@workingjubilee I don't think it's this PR fault that the rollup failed. The more likely explanation given the source code is #125433.

[surechen]

@workingjubilee I don't think it's this PR fault that the rollup failed. The more likely explanation given the source code is #125433.

It certainly seems so. My PR would check

fn main() { let mut x = 3; drop(x); }

Where should the repairs be made to make them suitable?

[Urgau]

Where should the repairs be made to make them suitable?

In the Cargo repository, by submitting a PR fixing the test https://github.com/rust-lang/cargo/blob/a8d72c675ee52dd57f0d8f2bae6655913c15b2fb/tests/testsuite/fix.rs#L504-L545

[bors]

⌛ Testing commit d1f0bc7 with merge 5a6498d...

[rust-log-analyzer]

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

error: failed retrieving file 'mingw-w64-x86_64-headers-git-11.0.0.r547.g4c8123efb-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-x86_64-gdb-14.1-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-x86_64-crt-git-11.0.0.r547.g4c8123efb-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
warning: too many errors from mirror.msys2.org, skipping for the remainder of this transaction
error: failed retrieving file 'mingw-w64-x86_64-openssl-3.2.0-1-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
 mingw-w64-x86_64-python-3.11.7-1-any downloading...
 mingw-w64-x86_64-gcc-ada-13.2.0-3-any downloading...
 mingw-w64-x86_64-gcc-objc-13.2.0-3-any downloading...
warning: failed to retrieve some files

[bors]

💔 Test failed - checks-actions

[onur-ozkan]

error: failed retrieving file 'mingw-w64-x86_64-headers-git-11.0.0.r547.g4c8123efb-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-x86_64-gdb-14.1-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-x86_64-crt-git-11.0.0.r547.g4c8123efb-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
warning: too many errors from mirror.msys2.org, skipping for the remainder of this transaction
error: failed retrieving file 'mingw-w64-x86_64-openssl-3.2.0-1-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
mingw-w64-x86_64-python-3.11.7-1-any downloading...
mingw-w64-x86_64-gcc-ada-13.2.0-3-any downloading...
mingw-w64-x86_64-gcc-objc-13.2.0-3-any downloading...
warning: failed to retrieve some files

Seems like a temporary network problem. @bors retry

[workingjubilee]

@Urgau Oh.

Why don't we run that test in the PR CI...?

[bors]

⌛ Testing commit d1f0bc7 with merge 1ba35e9...

[bors]

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 1ba35e9 to master...

[weihanglo]

@workingjubilee

It checks too much stuff I guess?

These are additional stuff we need to test

rust/src/bootstrap/mk/Makefile.in

Lines 50 to 82 in 606afbb

	check-aux:
	$(Q)$(BOOTSTRAP) test --stage 2 \
	src/tools/cargo \
	src/tools/cargotest \
	$(BOOTSTRAP_ARGS)
	# Run standard library tests in Miri.
	$(Q)BOOTSTRAP_SKIP_TARGET_SANITY=1 \
	$(BOOTSTRAP) miri --stage 2 \
	library/core \
	library/alloc \
	--no-doc
	# Some doctests have intentional memory leaks.
	$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
	$(BOOTSTRAP) miri --stage 2 \
	library/core \
	library/alloc \
	--doc
	# In `std` we cannot test everything.
	$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
	$(BOOTSTRAP) miri --stage 2 library/std \
	--no-doc -- \
	--skip fs:: --skip net:: --skip process:: --skip sys::pal::
	$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
	$(BOOTSTRAP) miri --stage 2 library/std \
	--doc -- \
	--skip fs:: --skip net:: --skip process:: --skip sys::pal::
	# Also test some very target-specific modules on other targets
	# (making sure to cover an i686 target as well).
	$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
	$(BOOTSTRAP) miri --stage 2 library/std \
	--target aarch64-apple-darwin,i686-pc-windows-msvc \
	--no-doc -- \
	time:: sync:: thread:: env::

[rust-timer]

Finished benchmarking commit (1ba35e9): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary -3.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.0%, -3.0%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 671.029s -> 672.69s (0.25%)
Artifact size: 315.62 MiB -> 315.68 MiB (0.02%)