Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add comment about keeping flags in sync between bootstrap.py and bootstrap.rs #118650

Merged
merged 1 commit into from
Dec 6, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Dec 5, 2023

They got out of sync, probably because this comment was missing on the Python side (it only exists on the Rust side). #118642 brings the flags back in sync but does not fix the comment, so let's do that here.

r? clubby789

@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 Dec 5, 2023
@klensy
Copy link
Contributor

klensy commented Dec 5, 2023

#114209 enters chat.

@RalfJung
Copy link
Member Author

RalfJung commented Dec 5, 2023

I think #114209 wouldn't help if one doesn't mark both sides as needing "sync"?

@clubby789
Copy link
Contributor

Whoops, thank you
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 6, 2023

📌 Commit 68ea621 has been approved by clubby789

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 Dec 6, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#116496 (Provide context when `?` can't be called because of `Result<_, E>`)
 - rust-lang#117563 (docs: clarify explicitly freeing heap allocated memory)
 - rust-lang#117874 (`riscv32` platform support)
 - rust-lang#118516 (Add ADT variant infomation to StableMIR and finish implementing TyKind::internal())
 - rust-lang#118650 (add comment about keeping flags in sync between bootstrap.py and bootstrap.rs)
 - rust-lang#118664 (docs: remove rust-lang#110800 from release notes)
 - rust-lang#118669 (library: fix comment about const assert in win api)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 756bc44 into rust-lang:master Dec 6, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 6, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2023
Rollup merge of rust-lang#118650 - RalfJung:flags-sync, r=clubby789

add comment about keeping flags in sync between bootstrap.py and bootstrap.rs

They got out of sync, probably because this comment was missing on the Python side (it only exists on the Rust side). rust-lang#118642 brings the flags back in sync but does not fix the comment, so let's do that here.

r? clubby789
@RalfJung RalfJung deleted the flags-sync branch December 6, 2023 21:24
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.

5 participants