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

Make all download functions need only Config, not Builder #104188

Merged
merged 1 commit into from
Nov 14, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Nov 9, 2022

This also adds a new mod download instead of scattering the download code across config.rs and native.rs.

This is the simplest and also most bit-rotty part of #102282. Opening it earlier so it's not mixed in with behavior changes and to avoid rebase hell.

cc #94829 (which nows has the hackmd linked).

r? @Mark-Simulacrum

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 9, 2022
@jyn514
Copy link
Member Author

jyn514 commented Nov 9, 2022

@bors p=5 prone to bitrot

@jyn514
Copy link
Member Author

jyn514 commented Nov 9, 2022

In retrospect I probably should have separated the move to a different file into its own commit :( let me know if you want me to spend time on that.

@bors
Copy link
Contributor

bors commented Nov 13, 2022

☔ The latest upstream changes (presumably #104078) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

Apologies for a slower review here -- r=me on this with a rebase.

@Mark-Simulacrum Mark-Simulacrum 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 Nov 13, 2022
This also adds a new `mod download` instead of scattering the download code
across `config.rs` and `native.rs`.
@jyn514
Copy link
Member Author

jyn514 commented Nov 14, 2022

Thanks!

@bors r=Mark-Simulacrum rollup=iffy

@bors
Copy link
Contributor

bors commented Nov 14, 2022

📌 Commit fb471de 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 Nov 14, 2022
@bors
Copy link
Contributor

bors commented Nov 14, 2022

⌛ Testing commit fb471de with merge f90a4ff...

@bors
Copy link
Contributor

bors commented Nov 14, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2022
@bors bors merged commit f90a4ff into rust-lang:master Nov 14, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 14, 2022
@jyn514 jyn514 deleted the download-config-only branch November 14, 2022 06:30
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f90a4ff): 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)
-3.7% [-5.1%, -2.9%] 4
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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.5% [-5.8%, -3.2%] 6
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -4.5% [-5.8%, -3.2%] 6

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.

5 participants