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

bump compiler and tools to windows 0.59, bootstrap to 0.57 #135487

Merged
merged 3 commits into from
Jan 22, 2025

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jan 14, 2025

This bumps compiler and tools to windows 0.59 (temporary dupes version, as sysinfo still depend on <= 0.57).
Bootstrap bumps only to 0.57 (the same sysinfo dep).

This additionally resolves my comment #130874 (comment)

Will work on it in follow up pr: There still some sus imports for rustc_driver.dll like ws2_32 or RoOriginateErrorW, but i will look at them later.

@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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 A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added the A-tidy Area: The tidy tool label Jan 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2025

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@klensy
Copy link
Contributor Author

klensy commented Jan 14, 2025

Okay, RoOriginateErrorW can be removed with microsoft/windows-rs#3126 and cfg windows_slim_errors

As for ws2_32, maybe after #122362?

@Mark-Simulacrum
Copy link
Member

There still some sus imports for rustc_driver.dll like ws2_32 or RoOriginateErrorW, but i will look at them later.

Do you have more context you can share on this? Is this something we should block merging on perhaps? The changes in this PR look fine to me, but this seems at least good to either drop from the PR description (if not actually relevant here?) or rephrase (e.g., pointing to some issue for follow-up work)...

@klensy
Copy link
Contributor Author

klensy commented Jan 19, 2025

There still some sus imports for rustc_driver.dll like ws2_32 or RoOriginateErrorW, but i will look at them later.

Do you have more context you can share on this? Is this something we should block merging on perhaps? The changes in this PR look fine to me, but this seems at least good to either drop from the PR description (if not actually relevant here?) or rephrase (e.g., pointing to some issue for follow-up work)...

No, this pr ready to review and merge, added note that will work on other imports in followup pr.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 20, 2025

📌 Commit 6aeaa94 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 Jan 20, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 20, 2025
…crum

bump compiler and tools to windows 0.59, bootstrap to 0.57

This bumps compiler and tools to windows 0.59 (temporary dupes version, as `sysinfo` still depend on <= 0.57).
Bootstrap bumps only to 0.57 (the same sysinfo dep).

This additionally resolves my comment rust-lang#130874 (comment)

Will work on it in follow up pr: There still some sus imports for `rustc_driver.dll` like ws2_32 or RoOriginateErrorW, but i will look at them later.
jhpratt added a commit to jhpratt/rust that referenced this pull request Jan 21, 2025
…crum

bump compiler and tools to windows 0.59, bootstrap to 0.57

This bumps compiler and tools to windows 0.59 (temporary dupes version, as `sysinfo` still depend on <= 0.57).
Bootstrap bumps only to 0.57 (the same sysinfo dep).

This additionally resolves my comment rust-lang#130874 (comment)

Will work on it in follow up pr: There still some sus imports for `rustc_driver.dll` like ws2_32 or RoOriginateErrorW, but i will look at them later.
@jieyouxu
Copy link
Member

@bors rollup=iffy (dep bumps)

@klensy
Copy link
Contributor Author

klensy commented Jan 21, 2025

Rebased, other dep updates broken Cargo.lock for this one.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks

@jieyouxu
Copy link
Member

@bors r=@Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jan 21, 2025

📌 Commit 6c5f084 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 21, 2025

⌛ Testing commit 6c5f084 with merge a24bdc6...

@bors
Copy link
Contributor

bors commented Jan 22, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 22, 2025
@bors bors merged commit a24bdc6 into rust-lang:master Jan 22, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 22, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a24bdc6): 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 -2.8%)

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% [-4.0%, -1.4%] 5
All ❌✅ (primary) - - 0

Cycles

Results (secondary -3.1%)

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.1% [-3.5%, -2.6%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 765.516s -> 763.897s (-0.21%)
Artifact size: 326.01 MiB -> 325.99 MiB (-0.01%)

@klensy
Copy link
Contributor Author

klensy commented Jan 22, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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
Development

Successfully merging this pull request may close these issues.

7 participants