Skip to content

bootstrap minor improvements and clean-ups #128588

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

Merged
merged 3 commits into from
Aug 19, 2024

Conversation

onur-ozkan
Copy link
Member

3rd commit fixes #128553 (comment).

@rustbot
Copy link
Collaborator

rustbot commented Aug 3, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Aug 3, 2024
Comment on lines -1453 to -1454
// FIXME: cargo bench/install do not accept `--release`
// and miri doesn't want it
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem like a FIXME note; it's more like a regular note.

Comment on lines -1102 to -1105
// FIXME: tool_std is not quite right, we shouldn't allow nightly features.
// But `builder.cargo` doesn't know how to handle ToolBootstrap in stages other than 0,
// and this is close enough for now.
Rls, "src/tools/rls", "rls", stable=true, tool_std=true;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an outdated FIXME we had for rust-demangler.

Comment on lines -619 to -620
// FIXME: maybe we should do this for download-rustc as well? but it would be a pain to update
// this on each and every nightly ...
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds painful and I think we will never be doing this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a future possibility, maybe distribute the hashes with the tarballs?
Or resurrect the signing of the artifacts...

@bors
Copy link
Collaborator

bors commented Aug 4, 2024

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

@onur-ozkan onur-ozkan force-pushed the clean-up-bootstrap-internals branch from ff022f1 to 8d7c374 Compare August 6, 2024 17:31
@onur-ozkan
Copy link
Member Author

Rebased.

Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment on lines -619 to -620
// FIXME: maybe we should do this for download-rustc as well? but it would be a pain to update
// this on each and every nightly ...
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a future possibility, maybe distribute the hashes with the tarballs?
Or resurrect the signing of the artifacts...

@albertlarsan68
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Aug 19, 2024

📌 Commit 8d7c374 has been approved by albertlarsan68

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 Aug 19, 2024
@bors
Copy link
Collaborator

bors commented Aug 19, 2024

⌛ Testing commit 8d7c374 with merge 5601d14...

@bors
Copy link
Collaborator

bors commented Aug 19, 2024

☀️ Test successful - checks-actions
Approved by: albertlarsan68
Pushing 5601d14 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 19, 2024
@bors bors merged commit 5601d14 into rust-lang:master Aug 19, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 19, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5601d14): 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 (secondary -0.4%)

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)
4.2% [4.2%, 4.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.0% [-5.0%, -5.0%] 1
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 749.361s -> 748.109s (-0.17%)
Artifact size: 336.71 MiB -> 336.74 MiB (0.01%)

@onur-ozkan onur-ozkan deleted the clean-up-bootstrap-internals branch August 20, 2024 04:25
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.

compiling rust from github source fails to find rustup
5 participants