Skip to content

Conversation

onur-ozkan
Copy link
Contributor

@onur-ozkan onur-ozkan commented Nov 23, 2023

@rustbot
Copy link
Collaborator

rustbot commented Nov 23, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 Nov 23, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 23, 2023

This PR changes config.example.toml. If appropriate, please also update CONFIG_CHANGE_HISTORY in src/bootstrap/src/lib.rs and change-id in config.example.toml.

@onur-ozkan onur-ozkan changed the title Followups general improvements/fixes on bootstrap Nov 23, 2023
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 24, 2023

📌 Commit e260563 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors 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 Nov 24, 2023
This fixes the problem of not being able to see bootstrap config
changes unless the change-id in config.toml changes.

Signed-off-by: onur-ozkan <[email protected]>
Because bootstrap lib is already large and complicated, this should
make the "bumping change-id" process easier.

Signed-off-by: onur-ozkan <[email protected]>
@onur-ozkan
Copy link
Contributor Author

(resolved conflicts)

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Nov 24, 2023

📌 Commit 576a17e has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
Rollup of 9 pull requests

Successful merges:

 - rust-lang#118220 (general improvements/fixes on bootstrap)
 - rust-lang#118251 (rustdoc-search: avoid infinite where clause unbox)
 - rust-lang#118253 (Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`)
 - rust-lang#118255 (Request that rust-analyzer changes are sent upstream first if possible)
 - rust-lang#118259 (Move EagerResolution to rustc_infer::infer::resolve)
 - rust-lang#118262 (Relate Inherent Associated Types using eq)
 - rust-lang#118266 (Move stuff around on `stable_mir` and `rustc_smir` crate)
 - rust-lang#118271 (Separate `NaN`/`Inf` floats with `_`)
 - rust-lang#118274 (Fix smir's `Ty::Ref` pretty printing)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb2c498 into rust-lang:master Nov 25, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 25, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
Rollup merge of rust-lang#118220 - onur-ozkan:followups, r=Mark-Simulacrum

general improvements/fixes on bootstrap

- adds rust-lang#117813 into change tracker rust-lang@6d9b92f
- fixes a bug in change tracker rust-lang@63a4410
- relocates `CONFIG_CHANGE_HISTORY` rust-lang@a7dcb98
@onur-ozkan onur-ozkan deleted the followups branch February 17, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

4 participants