Skip to content

fix ./configure --set change-id #119294

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Dec 26, 2023
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 25, 2023

the logic for this is kinda hacky and treats whitespace as significant

def configure_top_level_key(lines, top_level_key, value):
for i, line in enumerate(lines):
if line.startswith('#' + top_level_key + ' = ') or line.startswith(top_level_key + ' = '):
lines[i] = "{} = {}".format(top_level_key, to_toml(value))
return
raise RuntimeError("failed to find config line for {}".format(top_level_key))

r? @onur-ozkan

@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 25, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 25, 2023

This PR modifies config.example.toml.

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

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 25, 2023

📌 Commit 0e88874 has been approved by onur-ozkan

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 25, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 26, 2023
…-ozkan

fix `./configure --set change-id`

the logic for this is kinda hacky and treats whitespace as significant https://github.com/rust-lang/rust/blob/d1e26401bc70a58e6daf1816d542be4573bbab84/src/bootstrap/configure.py#L485-L491

r? `@onur-ozkan`
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 26, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#119287 (Fix doc typo for read_exact_at)
 - rust-lang#119294 (fix `./configure --set change-id`)
 - rust-lang#119303 (Update sysinfo)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c59de6b into rust-lang:master Dec 26, 2023
@rustbot rustbot added this to the 1.77.0 milestone Dec 26, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 26, 2023
Rollup merge of rust-lang#119294 - jyn514:configure-change-id, r=onur-ozkan

fix `./configure --set change-id`

the logic for this is kinda hacky and treats whitespace as significant https://github.com/rust-lang/rust/blob/d1e26401bc70a58e6daf1816d542be4573bbab84/src/bootstrap/configure.py#L485-L491

r? ``@onur-ozkan``
@jyn514 jyn514 deleted the configure-change-id branch January 8, 2025 12:08
# for free to join this conversation on GitHub. Already have an account? # 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.

4 participants