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

update build.extended comments in config.example.toml #115530

Merged
merged 1 commit into from
Sep 11, 2023

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Sep 4, 2023

Fixes #115502

@rustbot
Copy link
Collaborator

rustbot commented Sep 4, 2023

r? @Mark-Simulacrum

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

@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 Sep 4, 2023
@onur-ozkan onur-ozkan marked this pull request as draft September 4, 2023 13:09
@onur-ozkan onur-ozkan added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2023
@onur-ozkan onur-ozkan changed the title be more clear on build.extended comment fill build.tools on ./configure --enable-extended Sep 4, 2023
@onur-ozkan onur-ozkan marked this pull request as ready for review September 4, 2023 13:50
@onur-ozkan onur-ozkan added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 4, 2023
@Mark-Simulacrum
Copy link
Member

I would prefer to avoid populating a fixed list, because that means future changes to the list lead to breakage even if the user just wanted the default. Can we change the comment to mention that tools may not exist or point to config.example.toml instead?

@onur-ozkan
Copy link
Member Author

I would prefer to avoid populating a fixed list

How about reading this from config.example.toml instead having a fixed hard-coded list? So changes in example config will be reflected to here as well.

@Mark-Simulacrum
Copy link
Member

I'm not sure I follow. My point is that I don't want to persist the current (default/non-default) list of tools into config.toml at the time of ./configure. So I don't think reading config.toml helps?

@onur-ozkan
Copy link
Member Author

Can we change the comment to mention that tools may not exist or point to config.example.toml instead?

Didn't you mean this list

# fill the build.tools with default values if build.extended is enabled
if known_args.get('extended', False) and 'tools' not in known_args:
tools = [
"cargo",
"clippy",
"rustdoc",
"rustfmt",
"rust-analyzer",
"analysis",
"src",
]

would be unsynchronized with the value in config.example.toml?

Did I missed your point?

@Mark-Simulacrum
Copy link
Member

I think so. That list getting desynchronized is certainly a concern, but the larger concern I have is with the result of the configure script, i.e., the config.toml file. I don't want to persist an explicit configuration that we may change over time if the user hasn't explicitly requested that configuration.

@onur-ozkan
Copy link
Member Author

onur-ozkan commented Sep 10, 2023

Oh, I see.

Hmm, now I am thinking if handling this(e.g., if extended is true and tools is not defined, use tools from config.example.toml as default value) in bootstrap/config.rs would be a good idea. So we don't end up persisting this list to config.toml for people, and we can catch the issues with this list on CI pipelines.

@Mark-Simulacrum
Copy link
Member

My impression is that we do that. The issue this is trying to close is just about a misleading comment, right? It's not actually about changing any functionality.

@onur-ozkan
Copy link
Member Author

My impression is that we do that.

Yes, I just checked it. Sorry for any confusion/noises; I thought we were missing the functionality as well.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 10, 2023

📌 Commit 838a97223211298fab13df2b44883e4fde4a56f7 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 Sep 10, 2023
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 10, 2023
@onur-ozkan
Copy link
Member Author

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Sep 10, 2023

📌 Commit 685b5c2 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 10, 2023
@onur-ozkan
Copy link
Member Author

r-
r=Mark-Simulacrum

(check config.example.toml to see its default value) part was pushed after half a second of r+

@onur-ozkan onur-ozkan changed the title fill build.tools on ./configure --enable-extended update build.extended comments in config.example.toml Sep 10, 2023
@bors
Copy link
Contributor

bors commented Sep 11, 2023

⌛ Testing commit 685b5c2 with merge e39976f...

@bors
Copy link
Contributor

bors commented Sep 11, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing e39976f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 11, 2023
@bors bors merged commit e39976f into rust-lang:master Sep 11, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e39976f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.5% [1.5%, 1.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.5% [1.5%, 1.5%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 629.513s -> 628.501s (-0.16%)
Artifact size: 317.49 MiB -> 317.64 MiB (0.05%)

@onur-ozkan onur-ozkan deleted the update-config-info-comment branch September 14, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

config.toml generated by ./configure does not include tools= definition anymore
5 participants