Skip to content

[beta] backports #148075

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 8 commits into from
Oct 25, 2025
Merged

[beta] backports #148075

merged 8 commits into from
Oct 25, 2025

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Oct 24, 2025 •
edited
Loading

r? cuviper

clarfonthey and others added 7 commits October 24, 2025 10:12
@clarfonthey @cuviper
Revert inference failure from AsRef constification
b6d30fa 
(cherry picked from commit cb7fb35)
@clarfonthey @cuviper
Revert inference failure from Deref/Borrow constification
5668098 
(cherry picked from commit ebd5bea)
@clarfonthey @cuviper
Add regression test for inference failures
21ffe30 
(cherry picked from commit 4a4f3b0)
@lqd @cuviper
Revert "Auto merge of rust-lang#146121 - Muscraft:filter-suggestion-p…
c956a76 
…arts, r=petrochenkov"

This reverts commit 99317ef, reversing
changes made to 9cd272d.

(cherry picked from commit a2b4833)
@lqd @cuviper
add crashes tests for overlapping spans
1dda761 
(cherry picked from commit dd83c57)
@cuviper
Add a regression test for rust-lang#147971
4bc789b 
(cherry picked from commit a81ed52)
@cuviper
Revert "feat: implement hash_map! macro"
912aba6 
This reverts commit 066023e.

(cherry picked from commit c01682e)
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. 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 Oct 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 24, 2025

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

@cuviper

This comment was marked as resolved.

Sign in to view
@tardyp @cuviper
fix panic when rustc tries to reduce intermediate filenames length wi…
1e668e0 
…th multi byte chars

The issue cannot be reproduced with the former testcase of creating external crates because
rust refuses to use "external crate 28_找出字符串中第一个匹配项的下标"
because it is not a valid indentifier (starts with number, and contain non ascii chars)

But still using 28_找出字符串中第一个匹配项的下标.rs as a filename is accepted by previous rustc releases
So we consider it valid, and add an integration test for it to catch any regression on other code related to non ascii filenames.

(cherry picked from commit c6acffe)
@rustbot rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Oct 24, 2025
@cuviper
Copy link
Member Author

cuviper commented Oct 24, 2025

@bors r+ p=1 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 24, 2025

📌 Commit 1e668e0 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 Oct 24, 2025
bors added a commit that referenced this pull request Oct 25, 2025
@bors
Auto merge of #148075 - cuviper:beta-next, r=cuviper
f2b739d 
[beta] backports

- Revert constification of `AsRef for Cow` due to inference failure #148011
- Revert constification of `Borrow` and `Deref for Cow` due to inference failure #148016
- Revert "fix: Filter suggestion parts that match existing code" #148043
- Revert "feat: implement `hash_map!` macro" #148049
- fix panic when rustc tries to reduce intermediate filenames len with utf8 #148018

r? cuviper
@bors
Copy link
Collaborator

bors commented Oct 25, 2025

⌛ Testing commit 1e668e0 with merge f2b739d...

@bors
Copy link
Collaborator

bors commented Oct 25, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 25, 2025
@cuviper
Copy link
Member Author

cuviper commented Oct 25, 2025

No apparent error, just stopped while scraping licenses...

@bors retry

@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 Oct 25, 2025
@bors
Copy link
Collaborator

bors commented Oct 25, 2025

⌛ Testing commit 1e668e0 with merge f2f881b...

@bors
Copy link
Collaborator

bors commented Oct 25, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2025
@bors bors merged commit f2f881b into rust-lang:beta Oct 25, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Oct 25, 2025
This was referenced Oct 25, 2025
Closed
Closed
Closed
Open
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-run-make Area: port run-make Makefiles to rmake.rs 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-clippy Relevant to the Clippy team. 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.

Projects

None yet

Milestone

1.91.0

Development

Successfully merging this pull request may close these issues.

6 participants

@cuviper @rustbot @bors @clarfonthey @lqd @tardyp