Skip to content

[beta] backports#157787

Merged
rust-bors[bot] merged 6 commits into
rust-lang:betafrom
cuviper:beta-next
Jun 12, 2026
Merged

[beta] backports#157787
rust-bors[bot] merged 6 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuviper cuviper commented Jun 11, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

r? cuviper

jieyouxu and others added 5 commits June 10, 2026 12:11
@jieyouxu @mati865
Revert "Build shared LLVM lib for windows-gnullvm"
58141b2 
This reverts commit 1d1280a.

Looks like this causes problems with certain LLVM bin tools not finding
`libLLVM` on `*-windows-gnullvm`. This commit is a _minimal_ revert to
return us to known state to alleviate time pressure to investigate.
@bjorn3 @cuviper
Allow building the source tarballs while offline
e2d113f 
Previously locally vendored dependencies wouldn't be reused when
building the source tarball, instead everything would be downloaded from
the internet again (if not in the cargo cache).

(cherry picked from commit b665316)
@petrochenkov @cuviper
resolve: Partially revert "Remove a special case for dummy imports"
e71aa04 
(cherry picked from commit 816c70b)
@petrochenkov @cuviper
Add a regression test for issue 157420
37c14d3 
(cherry picked from commit ea1e984)
@petrochenkov @cuviper
resolve: Remove exported imports from maybe_unused_trait_imports
024c353 
(cherry picked from commit b4a1fc7)
@rustbot rustbot added A-CI Area: Our Github Actions CI 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 11, 2026
@cuviper

cuviper commented Jun 11, 2026

Copy link
Copy Markdown
Member Author

Note, #157713 is approved but hasn't merged yet -- I'll wait for that before proceeding here.

@cuviper cuviper mentioned this pull request Jun 11, 2026
Merged
@cuviper

cuviper commented Jun 12, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors

rust-bors Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 024c353 has been approved by cuviper

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 12, 2026
@JonathanBrouwer

JonathanBrouwer commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Can we put #157792 in as well?

@rust-bors rust-bors Bot 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 Jun 12, 2026
@rust-bors

rust-bors Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit 4cc21344c26f1f757f7e6b4a629cd822bc1192b4 was pushed.

This pull request was unapproved.

@cuviper

cuviper commented Jun 12, 2026

Copy link
Copy Markdown
Member Author

@bors r+

@rust-bors

rust-bors Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 4cc2134 has been approved by cuviper

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 12, 2026
@rustbot

rustbot commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

@JonathanBrouwer JonathanBrouwer mentioned this pull request Jun 12, 2026
Closed
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 12, 2026
@rust-bors

rust-bors Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: cuviper
Duration: 3h 52m 27s
Pushing 36645eb to beta...

@rust-bors rust-bors Bot merged commit 36645eb into rust-lang:beta Jun 12, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Jun 12, 2026
@theemathas theemathas mentioned this pull request Jun 12, 2026
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-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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.

Projects

None yet

Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

7 participants

@cuviper @JonathanBrouwer @rustbot @jieyouxu @bjorn3 @petrochenkov @weihanglo