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

jyn514 · 2023-12-25T13:04:46Z

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

Lines 485 to 491 in d1e2640

    
           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 · 2023-12-25T13:04:55Z

This PR modifies config.example.toml.

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

onur-ozkan · 2023-12-25T13:18:59Z

@bors r+ rollup

bors · 2023-12-25T13:19:01Z

📌 Commit 0e88874 has been approved by onur-ozkan

It is now in the queue for this repository.

…-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`

…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

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``

fix ./configure --set change-id

0e88874

rustbot assigned onur-ozkan Dec 25, 2023

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

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

jyn514 mentioned this pull request Dec 25, 2023

suppress change-tracker warnings in CI containers #119298

Merged

matthiaskrgr mentioned this pull request Dec 26, 2023

Rollup of 4 pull requests #119311

Closed

matthiaskrgr mentioned this pull request Dec 26, 2023

Rollup of 3 pull requests #119313

Merged

bors merged commit c59de6b into rust-lang:master Dec 26, 2023
11 checks passed

rustbot added this to the 1.77.0 milestone Dec 26, 2023

jyn514 deleted the configure-change-id branch January 8, 2025 12:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jyn514 commented Dec 25, 2023 •

edited

Loading

rustbot commented Dec 25, 2023

onur-ozkan commented Dec 25, 2023

bors commented Dec 25, 2023

	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))

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

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

Conversation

jyn514 commented Dec 25, 2023 • edited Loading

rustbot commented Dec 25, 2023

onur-ozkan commented Dec 25, 2023

bors commented Dec 25, 2023

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

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

jyn514 commented Dec 25, 2023 •

edited

Loading