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.

Sign up for GitHub

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

Jump to bottom

Remove build_helper #94480

Merged
merged 2 commits into from
Mar 5, 2022
Merged

Remove build_helper #94480

merged 2 commits into from
Mar 5, 2022

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Mar 1, 2022

The majority of the code is only used by either rustbuild or
rustc_llvm's build script. Rust_build is compiled once for rustbuild and
once for every stage. This means that the majority of the code in this
crate is needlessly compiled multiple times. By moving only the code
actually used by the respective crates to rustbuild and rustc_llvm's
build script, this needless duplicate compilation is avoided.

@bjorn3 bjorn3 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 1, 2022
@rust-highfive
Copy link
Collaborator

r? @lcnr

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2022
@bjorn3 bjorn3 force-pushed the no_build_helper branch from d637ec5 to f59d3c4 Compare March 1, 2022 11:58
@lcnr
Copy link
Contributor

lcnr commented Mar 1, 2022

lgtm, never interacting with this code before, so maybe

r? @Mark-Simulacrum

for final signoff

@rust-highfive rust-highfive assigned Mark-Simulacrum and unassigned lcnr Mar 1, 2022
@Mark-Simulacrum
Copy link
Member

r=me with nit fixed

@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 Mar 2, 2022
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 3, 2022

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 3, 2022

📌 Commit b8a047cd622f63b881fb2df7c479bf00faaf2abf has been approved by Mark-Simulacrum

@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 Mar 3, 2022
@bors
Copy link
Contributor

bors commented Mar 4, 2022

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

@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 Mar 4, 2022
@bjorn3 bjorn3 force-pushed the no_build_helper branch from b8a047c to 3b26b91 Compare March 4, 2022 08:32
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 4, 2022

Rebased

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 4, 2022

📌 Commit 3b26b91 has been approved by Mark-Simulacrum

@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 Mar 4, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94480 - bjorn3:no_build_helper, r=Mark-Simu…
03a9aaa 
…lacrum

Remove build_helper

The majority of the code is only used by either rustbuild or
rustc_llvm's build script. Rust_build is compiled once for rustbuild and
once for every stage. This means that the majority of the code in this
crate is needlessly compiled multiple times. By moving only the code
actually used by the respective crates to rustbuild and rustc_llvm's
build script, this needless duplicate compilation is avoided.
@matthiaskrgr
Copy link
Member

@bors r-
failed in a rollup #94606 (comment)

@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 Mar 4, 2022
@bors
Copy link
Contributor

bors commented Mar 5, 2022

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

@bjorn3 bjorn3 force-pushed the no_build_helper branch from e9ecb82 to c7e7f63 Compare March 5, 2022 14:13
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 5, 2022

Fixed and rebased.

@Mark-Simulacrum
Copy link
Member

r=me squashed in (2 commits is good)

bjorn3 added 2 commits March 5, 2022 15:31
@bjorn3
Remove build_helper
0cfc3e1 
The majority of the code is only used by either rustbuild or
rustc_llvm's build script. Rust_build is compiled once for rustbuild and
once for every stage. This means that the majority of the code in this
crate is needlessly compiled multiple times. By moving only the code
actually used by the respective crates to rustbuild and rustc_llvm's
build script, this needless duplicate compilation is avoided.
@bjorn3
Merge build_helper into util
e657da7
@bjorn3 bjorn3 force-pushed the no_build_helper branch from c7e7f63 to e657da7 Compare March 5, 2022 14:32
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 5, 2022

Squashed

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 5, 2022

📌 Commit e657da7 has been approved by Mark-Simulacrum

@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 Mar 5, 2022
@bors
Copy link
Contributor

bors commented Mar 5, 2022

⌛ Testing commit e657da7 with merge 379e94f...

@bors
Copy link
Contributor

bors commented Mar 5, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 5, 2022
@bors bors merged commit 379e94f into rust-lang:master Mar 5, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 5, 2022
@bjorn3 bjorn3 deleted the no_build_helper branch March 5, 2022 17:24
This was referenced Mar 5, 2022
Closed
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (379e94f): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.
8 participants
@bjorn3 @rust-highfive @lcnr @Mark-Simulacrum @bors @matthiaskrgr @rust-timer @rustbot