Skip to content

[beta] backports #142791

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

Merged
merged 9 commits into from
Jun 21, 2025
Merged

[beta] backports #142791

merged 9 commits into from
Jun 21, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jun 20, 2025

nnethercote and others added 8 commits June 17, 2025 10:30
This fixes a perf regression introduced in rust-lang#140252.

(cherry picked from commit 4cb9f03)
Because that causes an assertion failure in debug builds.

Fixes rust-lang#140884.

(cherry picked from commit 1cc0e38)
Fixes
rust-lang/rust-clippy#14397 (comment)

r? @samueltardieu

changelog: Don't warn about clippy.toml disallowed paths for crates that
were not loaded
…ppy#14730)

Closes rust-lang/rust-clippy#14722

changelog: [`collapsible_if`] fix FP on block stmt before expr
changelog: [`transmute_float_to_int, transmute_int_to_char,
transmute_int_to_float`, `transmute_num_to_bytes`]: remove lints, now in
rustc

these lints are now mostly in rustc, so they dont need to be in clippy
anymore

rust-lang#136083 (comment)

pending rust-lang#140431:
transmute_int_to_bool

<!-- TRIAGEBOT_START -->

<!-- TRIAGEBOT_SUMMARY_START -->

- ["Rust version of new lints should be checked" by
@samueltardieu](rust-lang/rust-clippy#14703 (comment))

Generated by triagebot, see
[help](https://forge.rust-lang.org/triagebot/note.html) for how to add
more
<!--
TRIAGEBOT_SUMMARY_DATA_START$${"entries_by_url":{"https://github.com/rust-lang/rust-clippy/pull/14703#issuecomment-2861982576":{"title":"Rust
version of new lints should be
checked","comment_url":"https://github.com/rust-lang/rust-clippy/pull/14703#issuecomment-2861982576","author":"samueltardieu"}}}$$TRIAGEBOT_SUMMARY_DATA_END
-->

<!-- TRIAGEBOT_SUMMARY_END -->
<!-- TRIAGEBOT_END -->
…ust-lang/rust-clippy#14810)

Rust 1.88 introduces the `dangerous_implicit_autorefs` lint which warns
about using implicit autorefs on a place obtained from a raw pointer, as
this may create aliasing issues.

Prevent `clippy::needless_borrow` from triggering in this case, by
disabling the lint when taking a reference on a raw pointer dereference.
There might be a better way for doing this in the long run with a finer
way of distinguish the problematic cases, but this will prevent Clippy
from contradicting the compiler in the meantime.

Fixes rust-lang/rust-clippy#14743

changelog: [`needless_borrow`]: do not contradict the compiler's
`dangerous_implicit_autorefs` lint even though the refererences are not
mandatory

@rustbot label +beta-nominated

<!-- TRIAGEBOT_START -->

<!-- TRIAGEBOT_SUMMARY_START -->


- [Beta nomination for
1.88](rust-lang/rust-clippy#14810 (comment))
by [samueltardieu](https://github.com/samueltardieu)

Generated by triagebot, see
[help](https://forge.rust-lang.org/triagebot/note.html) for how to add
more
<!--
TRIAGEBOT_SUMMARY_DATA_START$${"entries_by_url":{"https://github.com/rust-lang/rust-clippy/pull/14810#issuecomment-2883753957":{"title":"Beta
nomination for
1.88","comment_url":"https://github.com/rust-lang/rust-clippy/pull/14810#issuecomment-2883753957","author":"samueltardieu"}}}$$TRIAGEBOT_SUMMARY_DATA_END
-->

<!-- TRIAGEBOT_SUMMARY_END -->
<!-- TRIAGEBOT_END -->
The `mir_drops_elaborated_and_const_checked` query result has been
stolen already and cannot be borrowed again. Use the `optimized_mir`
query result instead.

changelog: [`missing_const_for_fn`]: fix ICE with some compilation
options

Fixes rust-lang/rust-clippy#14774

r? @Jarcho
@rustbot rustbot added 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. labels Jun 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 20, 2025

⚠️ Warning ⚠️

  • Some commits in this PR modify submodules.
  • There are username mentions (such as @user) in the commit messages of the following commits.
    Please remove the mentions to avoid spamming these users.
  • 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
Copy link
Member Author

cuviper commented Jun 20, 2025

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Jun 20, 2025

📌 Commit 124ec11 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 Jun 20, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jun 20, 2025

@bors p=5 (rollup scheduling)

@bors
Copy link
Collaborator

bors commented Jun 20, 2025

⌛ Testing commit 124ec11 with merge f1453a8...

bors added a commit that referenced this pull request Jun 20, 2025
[beta] backports

- Make the assertion in `Ident::new` debug-only. #140880
- Avoid creating an empty identifer in `Symbol::to_ident_string`. #141318
- Backport rust-lang/stdarch#1818 for 1.88 #142694
- [beta] Clippy backport #142725
    - ICE:
        - rust-lang/rust-clippy#14776
    - Lint contradictions:
        - rust-lang/rust-clippy#14703
        - rust-lang/rust-clippy#14810
    - Smaller (in LoC changes) fixes:
        - rust-lang/rust-clippy#14733
        - rust-lang/rust-clippy#14730

r? cuviper
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Jun 20, 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 Jun 20, 2025
@cuviper
Copy link
Member Author

cuviper commented Jun 20, 2025

error: static assertion failed: error STL1000: Unexpected compiler version, expected Clang 19.0.0 or newer.

I guess #140757 would fix that?

@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 Jun 20, 2025
@cuviper
Copy link
Member Author

cuviper commented Jun 20, 2025

@bors2 try jobs=x86_64-msvc-ext2

@rust-bors
Copy link

rust-bors bot commented Jun 20, 2025

⌛ Trying commit 1a63214 with merge 1a5e6ea

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jun 20, 2025
[beta] backports

- Make the assertion in `Ident::new` debug-only. #140880
- Avoid creating an empty identifer in `Symbol::to_ident_string`. #141318
- Backport rust-lang/stdarch#1818 for 1.88 #142694
- [beta] Clippy backport #142725
    - ICE:
        - rust-lang/rust-clippy#14776
    - Lint contradictions:
        - rust-lang/rust-clippy#14703
        - rust-lang/rust-clippy#14810
    - Smaller (in LoC changes) fixes:
        - rust-lang/rust-clippy#14733
        - rust-lang/rust-clippy#14730

r? cuviper

try-job: x86_64-msvc-ext2
@rust-bors
Copy link

rust-bors bot commented Jun 20, 2025

💔 Test failed

@cuviper
Copy link
Member Author

cuviper commented Jun 20, 2025

OK, I think that failure needs #141723, but we don't necessarily need that for release. The windows build at least got past the prior error, so let's see how full CI fares.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 20, 2025

📌 Commit 1a63214 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 Jun 20, 2025
@bors
Copy link
Collaborator

bors commented Jun 21, 2025

⌛ Testing commit 1a63214 with merge 32084cf...

@bors
Copy link
Collaborator

bors commented Jun 21, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2025
@bors bors merged commit 32084cf into rust-lang:beta Jun 21, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Jun 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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
Development

Successfully merging this pull request may close these issues.