Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:configure-change-id
Dec 26, 2023
Merged

fix ./configure --set change-id#119294
bors merged 1 commit into
rust-lang:masterfrom
jyn514:configure-change-id

Conversation

@jyn514

@jyn514jyn514 commented Dec 25, 2023•
edited
Loading

Copy link
Copy Markdown
Member

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

rust/src/bootstrap/configure.py

Lines 485 to 491 in d1e2640

defconfigure_top_level_key(lines, top_level_key, value):
fori, lineinenumerate(lines):
ifline.startswith('#'+top_level_key+' = ') orline.startswith(top_level_key+' = '):
lines[i] ="{} = {}".format(top_level_key, to_toml(value))
return
raiseRuntimeError("failed to find config line for {}".format(top_level_key))

r? @onur-ozkan

@rustbotrustbot 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

rustbot commented Dec 25, 2023

Copy link
Copy Markdown
Collaborator

This PR modifies config.example.toml.

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

@onur-ozkan

onur-ozkan commented Dec 25, 2023

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Dec 25, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 0e88874 has been approved by onur-ozkan

It is now in the queue for this repository.

@borsbors 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
@jyn514jyn514 mentioned this pull request Dec 25, 2023
Merged
@matthiaskrgrmatthiaskrgr mentioned this pull request Dec 26, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 26, 2023
@matthiaskrgr
Rollup merge ofrust-lang#119294- jyn514:configure-change-id, r=onur…
94e6156
…-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`
@matthiaskrgrmatthiaskrgr mentioned this pull request Dec 26, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 26, 2023
@bors
Auto merge ofrust-lang#119313- matthiaskrgr:rollup-41x48j6, r=matth…
a815c3b
…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:masterDec 26, 2023
@rustbotrustbot 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
@rust-timer
Unrolled build forrust-lang#119294
e480439
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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@onur-ozkanonur-ozkan

Labels

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

Projects

None yet

Milestone

1.77.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jyn514@rustbot@onur-ozkan@bors