Skip to content

[beta] backports #149572

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
Merged
merged 12 commits into from
Dec 4, 2025
Merged

[beta] backports #149572

merged 12 commits into from
Dec 4, 2025
+506 −75

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Dec 3, 2025 •
edited by rustbot
Loading

r? cuviper

tmiasko and others added 8 commits December 2, 2025 15:50
@tmiasko @cuviper
rustdoc: Use configured target modifiers when collecting doctests
7ace3ff 
To support loading dependencies with target modifiers and avoid ABI
mismatch errors.

(cherry picked from commit accd1fe)
@Muscraft @cuviper
fix(rustdoc): Color doctest errors
1c8bd26 
(cherry picked from commit c523b65)
@chenyukang @cuviper
Fix the issue of unused assignment from MIR liveness checking
1087de6 
(cherry picked from commit 4930d3e)
@chenyukang @cuviper
fix unused assigment issue for variable with drop, issue 148418
8070976 
(cherry picked from commit 00f3155)
@chenyukang @cuviper
Skip unused variables warning for unreachable code
4bd154f 
(cherry picked from commit 2c6b1d3)
@zachs18 @cuviper
In BTreeMap::eq, do not compare the elements if the sizes are diffe…
0f71be4 
…rent.

Reverts 68a7c25 in library/

(cherry picked from commit 4adcdbb)
@zachs18 @cuviper
Add regression test for collections' PartialEq::eq impls not comparin…
73018d7 
…g elements if lengths are different.

(cherry picked from commit 907f5c1)
@Jules-Bertholet @cuviper
Handle cycles when checking impl candidates for doc(hidden)
b1a2cb2 
Fixes rust-lang#149092

(cherry picked from commit f580357)
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 3, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol @cuviper
Generalize branch name in scripts
953e1ea 
(cherry picked from commit ae830ef)
@rustbot rustbot added A-CI Area: Our Github Actions CI 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 Dec 3, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol @cuviper
Change default branch to main
a81d13f 
(cherry picked from commit bc0126d)
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Dec 3, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

jieyouxu commented Dec 3, 2025

Note: I had to close the tree due to #149575, but try with p=1001 if beta isn't affected by that...

@cuviper
Copy link
Member Author

cuviper commented Dec 3, 2025 

fatal: ambiguous argument 'refs/remotes/origin/main..HEAD': unknown revision or path not in the working tree.

Seems I'm still missing something -- @Kobzol could you please take a look?
(note that I already cherry-picked a couple targeted commits for the branch change)

@ojeda ojeda mentioned this pull request Dec 3, 2025
Open
26 tasks
@Kobzol
Copy link
Member

Kobzol commented Dec 3, 2025

Huh, the command works for me locally. I'll investigate.

@cuviper
Copy link
Member Author

cuviper commented Dec 3, 2025 •
edited
Loading

Maybe it's citool #148785? I'll give that a shot...

@Kobzol
Copy link
Member

Kobzol commented Dec 3, 2025

I think that the problem is here. Pushed a possible fix.

@Kobzol
Copy link
Member

Kobzol commented Dec 3, 2025

Seems like that did the trick. The HEAD ref was interpreted literally, and it thus didn't create a main -> origin/main branch combo, so the following git command then failed. We should get rid of this rev-list command finally... I remember that (probably?) @pietroalbini had some ideas on how to do that, but I forgot those ideas xD

@cuviper
Copy link
Member Author

cuviper commented Dec 3, 2025

I'll wait for the rest of the PR checks, but are you ok with all the other branch-rename commits I've backported?
(And please make sure your new commit reaches main for future beta branches too.)

@Kobzol
Copy link
Member

Kobzol commented Dec 3, 2025

Yeah, the other things should be fine to land on beta.

@Kobzol Kobzol mentioned this pull request Dec 3, 2025
Open
@cuviper
Copy link
Member Author

cuviper commented Dec 3, 2025

@bors r+ rollup=never p=10

@bors
Copy link
Collaborator

bors commented Dec 3, 2025

📌 Commit 519b57b 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 Dec 3, 2025
@bors
Copy link
Collaborator

bors commented Dec 3, 2025

⌛ Testing commit 519b57b with merge ac0aff2...

@bors
Copy link
Collaborator

bors commented Dec 4, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 4, 2025
@bors bors merged commit ac0aff2 into rust-lang:beta Dec 4, 2025
12 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Dec 4, 2025
@Muscraft Muscraft mentioned this pull request Dec 4, 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-CI Area: Our Github Actions CI A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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. 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. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.