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

[beta] backports #137747

Merged
merged 12 commits into from
Mar 2, 2025
Merged

[beta] backports #137747

merged 12 commits into from
Mar 2, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Feb 27, 2025 •
edited
Loading

r? cuviper

pietroalbini and others added 10 commits February 27, 2025 10:48
@pietroalbini @cuviper
generate-copyright: pass the source root from bootstrap
f8f8aea 
(cherry picked from commit 36c314c)
@pietroalbini @cuviper
generate-copyright: pass the list of manifests from bootstrap
27380b9 
(cherry picked from commit 08b4f6d)
@pietroalbini @cuviper
generate-copyright: pass the vendored sources from bootstrap
9e285ba 
(cherry picked from commit 33e7f9b)
@pietroalbini @cuviper
use the shared vendor impl for plan source tarballs
935005b 
(cherry picked from commit 92f31b9)
@QianNangong @cuviper
Fix *-win7-windows-msvc target since 26eeac1
f32d360 
(cherry picked from commit 35febd7)
@onur-ozkan @cuviper
skip submodule updating logics on tarballs
4b9df12 
Signed-off-by: onur-ozkan <[email protected]>
(cherry picked from commit d2203ad)
@compiler-errors @cuviper
Improve behavior of IF_LET_RESCOPE around temporaries and place expre…
fd12db2 
…ssions

(cherry picked from commit bab03bf)
@compiler-errors @cuviper
More comments
0180dd9 
(cherry picked from commit 2797936)
@compiler-errors @cuviper
Consider lvalues of field and index as possibly temporary places
f54fe46 
(cherry picked from commit bad8e98)
@onur-ozkan @cuviper
downgrade bootstrap cc
86e362f 
Signed-off-by: onur-ozkan <[email protected]>
(cherry picked from commit e4ca11f)
@rustbot rustbot added O-windows Operating system: Windows 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 27, 2025
@cuviper
Copy link
Member Author

cuviper commented Feb 27, 2025

This will probably need whatever fixes the current MSVC treeclosed too: #137703 (comment)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Feb 28, 2025
@cuviper cuviper mentioned this pull request Feb 28, 2025
Merged
@cuviper
Copy link
Member Author

cuviper commented Feb 28, 2025

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Feb 28, 2025

📌 Commit 5ab5c81 has been approved by cuviper

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 Feb 28, 2025
@jieyouxu
Copy link
Member

Hm @cuviper, I think that workaround is no longer sufficient, you may need #137753 this time.

@jieyouxu
Copy link
Member

jieyouxu commented Feb 28, 2025 •
edited
Loading

@bors r- (I'm fairly sure this will fail without the remove-new-SDK workaround)

@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 Feb 28, 2025
@smalis-msft
Copy link

Should #137455 also be included since #137444 is?

@cuviper
Copy link
Member Author

cuviper commented Feb 28, 2025 •
edited
Loading

@jieyouxu thanks, I'll pull that in too, or rather instead since that reverts the first fix.

@smalis-msft you could nominate #137455 on that PR, especially if that's fixing any further regression, but AFAICS #137444 is working correctly on its own here.

@smalis-msft
Copy link

My understanding is that both are aimed at improving the new diagnostics introduced for migrating to the 2024 edition. Each works fine independently, yes, but they serve the same goal. I'll raise that on that PR.

@ChrisDenton @cuviper
Remove Win SDK 10.0.26100.0 from CI
4f0b4a4 
(cherry picked from commit 25617c7)
@cuviper
Copy link
Member Author

cuviper commented Feb 28, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Feb 28, 2025

📌 Commit 4f0b4a4 has been approved by cuviper

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 Feb 28, 2025
@weihanglo
Copy link
Member

@cuviper would you mind including #137842 to this PR? That one is fairly small and stable.

@cuviper
Copy link
Member Author

cuviper commented Mar 1, 2025 •
edited
Loading

Done!

@cuviper
Copy link
Member Author

cuviper commented Mar 1, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Mar 1, 2025

📌 Commit 4746aaf has been approved by cuviper

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 2, 2025

⌛ Testing commit 4746aaf with merge 61e1603...

@bors
Copy link
Contributor

bors commented Mar 2, 2025

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 61e1603 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 2, 2025
@bors bors merged commit 61e1603 into rust-lang:beta Mar 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Mar 2, 2025
@cuviper cuviper mentioned this pull request Mar 2, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.