Skip to content

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Mar 14, 2024

Backports included in this PR:

Each backport on its own might not warrant a backport, but the collection of those are nice QoL fixes for Clippy users, before those bugs hit stable.

All of those commits are already on master.

r? @Mark-Simulacrum

@rustbot
Copy link
Collaborator

rustbot commented Mar 14, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot
Copy link
Collaborator

rustbot commented Mar 14, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

PartiallyUntyped and others added 5 commits March 14, 2024 20:25
`os_local` impl of `thread_local` — regardless of whether it is const and
unlike other implementations — includes an `fn __init(): EXPR`.

Existing implementation of the lint checked for the presence of said
function and whether the expr can be made const. Because for `os_local`
we always have an `__init()`, it triggers for const implementations.

The solution is to check whether the `__init()` function is already const.
If it is `const`, there is nothing to do. Otherwise, we verify that we can
make it const.

Co-authored-by: Alejandra González <[email protected]>
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Mar 16, 2024

📌 Commit 046eb84 has been approved by Mark-Simulacrum

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 Mar 16, 2024
@bors
Copy link
Collaborator

bors commented Mar 16, 2024

⌛ Testing commit 046eb84 with merge 28fd269...

@bors
Copy link
Collaborator

bors commented Mar 16, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 28fd269 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 16, 2024
@bors bors merged commit 28fd269 into rust-lang:beta Mar 16, 2024
@rustbot rustbot added this to the 1.77.0 milestone Mar 16, 2024
@flip1995 flip1995 deleted the clippy_backport branch March 18, 2024 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants