Skip to content

bootstrap: Allow ./x fix --allow-dirty - #161220

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Zalathar:allow-dirty
Aug 19, 2026
Merged

bootstrap: Allow ./x fix --allow-dirty#161220
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Zalathar:allow-dirty

Conversation

@Zalathar

Copy link
Copy Markdown
Member

This PR forwards --allow-dirty from bootstrap to cargo, making ./x fix more convenient.

This was already possible via ./x fix -- --allow-dirty, but forwarding the argument from bootstrap is more user-friendly.

r? Kobzol (or bootstrap)

@rustbot

rustbot commented Aug 17, 2026

Copy link
Copy Markdown
Collaborator

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

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 17, 2026
@rustbot

rustbot commented Aug 17, 2026

Copy link
Copy Markdown
Collaborator

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

@Zalathar Zalathar changed the title Allow dirty bootstrap: Allow ./x fix --allow-dirty Aug 17, 2026

@Kobzol Kobzol left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, makes sense. Left one comment.

View changes since this review

Comment thread src/bootstrap/src/core/builder/cargo.rs Outdated
This was already possible via `./x fix -- --allow-dirty`, but forwarding the
argument from bootstrap is more user-friendly.
@Kobzol

Kobzol commented Aug 18, 2026

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e9963a8 has been approved by Kobzol

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 18, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 18, 2026
bootstrap: Allow `./x fix --allow-dirty`

- Extracted from rust-lang#160417, as `./x fix compiler` was fixed separately.
---

This PR forwards `--allow-dirty` from bootstrap to cargo, making `./x fix` more convenient.

This was already possible via `./x fix -- --allow-dirty`, but forwarding the argument from bootstrap is more user-friendly.

r? Kobzol (or bootstrap)
rust-bors Bot pushed a commit that referenced this pull request Aug 18, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #154210 (fix: fix the capture behavior of `if let` in closures)
 - #156176 (Initial implementation of `FnPtr` trait)
 - #160767 (Unify E0117 foreign-trait label for ADT/primitive types with existing Slice/Array/Tuple handling)
 - #160489 (Adding diagnostic item markers for multiple fs functions and structs)
 - #161220 (bootstrap: Allow `./x fix --allow-dirty`)
 - #161291 (Rename `ProjectionPredicate` and `TraitPredicate`)
 - #161296 (Enable overflow checks in `rustc_thread_pool`)
 - #161304 (Rename test so it matches the issue)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 18, 2026
bootstrap: Allow `./x fix --allow-dirty`

- Extracted from rust-lang#160417, as `./x fix compiler` was fixed separately.
---

This PR forwards `--allow-dirty` from bootstrap to cargo, making `./x fix` more convenient.

This was already possible via `./x fix -- --allow-dirty`, but forwarding the argument from bootstrap is more user-friendly.

r? Kobzol (or bootstrap)
jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 19, 2026
bootstrap: Allow `./x fix --allow-dirty`

- Extracted from rust-lang#160417, as `./x fix compiler` was fixed separately.
---

This PR forwards `--allow-dirty` from bootstrap to cargo, making `./x fix` more convenient.

This was already possible via `./x fix -- --allow-dirty`, but forwarding the argument from bootstrap is more user-friendly.

r? Kobzol (or bootstrap)
rust-bors Bot pushed a commit that referenced this pull request Aug 19, 2026
Rollup of 18 pull requests

Successful merges:

 - #154210 (fix: fix the capture behavior of `if let` in closures)
 - #156176 (Initial implementation of `FnPtr` trait)
 - #160767 (Unify E0117 foreign-trait label for ADT/primitive types with existing Slice/Array/Tuple handling)
 - #161297 (std: use UNIX's `Instant` and `SystemTime` on Hermit)
 - #160489 (Adding diagnostic item markers for multiple fs functions and structs)
 - #160643 (Require windowed (and exception) for Xtensa ABI)
 - #161088 (suppress projection errors already covered by a trait error)
 - #161114 (Remove fields from TypeKind: Struct, Enum, Union and Tuple)
 - #161115 (Assorted allocator nitpicks)
 - #161220 (bootstrap: Allow `./x fix --allow-dirty`)
 - #161296 (Enable overflow checks in `rustc_thread_pool`)
 - #161298 (remove rustc_error_messages dependency)
 - #161304 (Rename test so it matches the issue)
 - #161309 (`allow(non_camel_case_types)` in `minicore.rs`)
 - #161315 (Relax codgen test variable regex)
 - #161318 (Doc: clarify how `Read::bytes` handling Interrupted errors)
 - #161321 (Update books)
 - #161335 ([compiletest] Use the correct rustc lib directory for query_rustc_output)
@rust-bors
rust-bors Bot merged commit bde51bc into rust-lang:main Aug 19, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 19, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 19, 2026
Rollup merge of #161220 - Zalathar:allow-dirty, r=Kobzol

bootstrap: Allow `./x fix --allow-dirty`

- Extracted from #160417, as `./x fix compiler` was fixed separately.
---

This PR forwards `--allow-dirty` from bootstrap to cargo, making `./x fix` more convenient.

This was already possible via `./x fix -- --allow-dirty`, but forwarding the argument from bootstrap is more user-friendly.

r? Kobzol (or bootstrap)
@Zalathar
Zalathar deleted the allow-dirty branch August 19, 2026 06:16
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Aug 19, 2026
Rollup of 18 pull requests

Successful merges:

 - rust-lang/rust#154210 (fix: fix the capture behavior of `if let` in closures)
 - rust-lang/rust#156176 (Initial implementation of `FnPtr` trait)
 - rust-lang/rust#160767 (Unify E0117 foreign-trait label for ADT/primitive types with existing Slice/Array/Tuple handling)
 - rust-lang/rust#161297 (std: use UNIX's `Instant` and `SystemTime` on Hermit)
 - rust-lang/rust#160489 (Adding diagnostic item markers for multiple fs functions and structs)
 - rust-lang/rust#160643 (Require windowed (and exception) for Xtensa ABI)
 - rust-lang/rust#161088 (suppress projection errors already covered by a trait error)
 - rust-lang/rust#161114 (Remove fields from TypeKind: Struct, Enum, Union and Tuple)
 - rust-lang/rust#161115 (Assorted allocator nitpicks)
 - rust-lang/rust#161220 (bootstrap: Allow `./x fix --allow-dirty`)
 - rust-lang/rust#161296 (Enable overflow checks in `rustc_thread_pool`)
 - rust-lang/rust#161298 (remove rustc_error_messages dependency)
 - rust-lang/rust#161304 (Rename test so it matches the issue)
 - rust-lang/rust#161309 (`allow(non_camel_case_types)` in `minicore.rs`)
 - rust-lang/rust#161315 (Relax codgen test variable regex)
 - rust-lang/rust#161318 (Doc: clarify how `Read::bytes` handling Interrupted errors)
 - rust-lang/rust#161321 (Update books)
 - rust-lang/rust#161335 ([compiletest] Use the correct rustc lib directory for query_rustc_output)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants