fix(bootstrap): rename exclude flag to skip 🐛

[meysam81]

fixes #111894

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @clubby789 (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

[meysam81]

@clubby789

Would you take a look at this PR when you get some time?

Regards.

[bors]

☔ The latest upstream changes (presumably #114148) made this pull request unmergeable. Please resolve the merge conflicts.

[clubby789]

Apologies for not getting round to this yet. When you're rebasing to fix the merge conflicts, would you mind squashing your commits into one?

[rustbot]

These commits modify compiler targets.
(See the Target Tier Policy.)

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in abstract_const.rs

cc @BoxyUwU

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/cargo

cc @ehuss

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

[meysam81]

I wonder @clubby789, why contributors would need to squash their commits in a pull request when GitHub already gives you the option to do that upon merging (as shown in the screenshot below).

[saethlin]

Merging using the GitHub interface means that if two PRs pass the tests individually but together break, you would be allowed to merge both and break the master branch instead of getting a test failure. There is an option to "require pull requests be up to date before merging" in GitHub but it is brutal to use even on repos much less active than this one.

So Rust uses bors: https://graydon2.dreamwidth.org/1597.html

[bors]

☔ The latest upstream changes (presumably #114126) made this pull request unmergeable. Please resolve the merge conflicts.

[clubby789]

I think it would be a good idea to alias exclude to skip to not break existing workflows, but otherwise lgtm

[meysam81]

@clubby789
I searched through the directories recursively for all occurrences.
Unless there's a use for it outside this repository (maybe in a submodule).

[clubby789]

I mean for downstream users, i.e. developers/distros

[bors]

☔ The latest upstream changes (presumably #113592) made this pull request unmergeable. Please resolve the merge conflicts.

[joshtriplett]

AFAICT this got mislabeled as T-style (and other things) because it appeared to touch a bunch of files that it no longer touches.

[bors]

⌛ Testing commit 74022cec712e25257a9303a55ebde53f11634138 with merge a4e1c091f15040db57b63680d73e08fd7083eea6...

[bors]

💔 Test failed - checks-actions

[meysam81]

@bors try

[bors]

@meysam81: 🔑 Insufficient privileges: not in try users

[meysam81]

The failing test is passing locally, as seen in the snippet below. What should I do to reproduce/rerun this? @clubby789

$ time x test tests/run-pass-valgrind/cleanup-auto-borrow-obj.rs

...truncated

Testing stage1 compiletest suite=run-pass-valgrind mode=run-pass-valgrind (x86_64-unknown-linux-gnu)                   
                                                                                                                       
running 1 tests                                                                                                        
.                                                                                                                      
                                                                                                                       
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 16 filtered out; finished in 69.17ms                       
                                                                                                                       
Build completed successfully in 0:01:52                                                                                
                                                                                                                       
real    1m52.257s                                                                                                      
user    7m37.223s                                                                                                      
sys     0m54.704s                                                                                                      

[lnicola]

@bors try

[bors]

⌛ Trying commit 0b16456 with merge 04e28cdeb4242f58e7993862065f7ebc0e8fca4f...

[bors]

☀️ Try build successful - checks-actions
Build commit: 04e28cdeb4242f58e7993862065f7ebc0e8fca4f (04e28cdeb4242f58e7993862065f7ebc0e8fca4f)

[klensy]

This is spurious error. no need to fix anything, failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

[meysam81]

Alright then, would someone pls approve this before another mishappen occurs pls 🙏

[lnicola]

@meysam81 I have bors rights, but I don't normally merge PRs here, so let's wait for clubby789.

[meysam81]

@clubby789
any update on this?

[clubby789]

@bors r+

[bors]

📌 Commit 0b16456 has been approved by clubby789

It is now in the queue for this repository.

[bors]

⌛ Testing commit 0b16456 with merge abc910b...

[bors]

☀️ Test successful - checks-actions
Approved by: clubby789
Pushing abc910b to master...

[rust-timer]

Finished benchmarking commit (abc910b): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.1%	[-1.1%, -1.1%]	1

Max RSS (memory usage)

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

Cycles

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

Binary size

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

Bootstrap: 633.485s -> 632.664s (-0.13%)