Remove duplicated usage of -Zunstable-options in bootstrap

[GuillaumeGomez]

Surprisingly, sometimes it is in the same function.

r? @Kobzol

[GuillaumeGomez]

Fixed this case. I think a try might be welcome too.

@bors try

[bors]

⌛ Trying commit 16fd460 with merge cfba358...

[bors]

☀️ Try build successful - checks-actions
Build commit: cfba358 (cfba3580516729be30ec967b2309a0d972242bf0)

[Kobzol]

I checked the behavior with --dump-bootstrap-shims, looks like this indeed removed a bunch of dupication. This could also help with #116278, I remember that there were some issues with some bootstrap invocations missing the unstable options.

It's difficult to expect what could happen in all the possible situations, so let's just check if this passes CI.

[Kobzol]

@bors r+

[bors]

📌 Commit 16fd460 has been approved by Kobzol

It is now in the queue for this repository.

[Kobzol]

@bors rollup=never

[GuillaumeGomez]

Didn't know about --dump-bootstrap-shims. In my case I looked at rustdoc --test arguments haha.

[bors]

⌛ Testing commit 16fd460 with merge 35af14e...

[rust-log-analyzer]

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

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

[RUSTC-TIMING] miri test:false 4.435
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Fri, Aug 23, 2024  3:05:38 PM
  network time: Fri, 23 Aug 2024 15:05:38 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[bors]

💔 Test failed - checks-actions

[Kobzol]

@bors retry

[bors]

⌛ Testing commit 16fd460 with merge 97a5b85...

[rust-log-analyzer]

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

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

[RUSTC-TIMING] miri test:false 4.659
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Fri, Aug 23, 2024  6:23:34 PM
  network time: Fri, 23 Aug 2024 18:23:35 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[bors]

💔 Test failed - checks-actions

[Kobzol]

@bors retry

[bors]

⌛ Testing commit 16fd460 with merge 4074d49...

[bors]

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 4074d49 to master...

[rust-timer]

Finished benchmarking commit (4074d49): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -2.4%)

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)	-2.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.4%	[-2.4%, -2.4%]	1

Cycles

Results (secondary -2.3%)

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)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 751.017s -> 751.449s (0.06%)
Artifact size: 338.95 MiB -> 339.00 MiB (0.02%)