Skip to content

clippy fixes and code simplification#148211

Merged
bors merged 1 commit intorust-lang:masterfrom
hkBst:clippy-fix-13
Nov 3, 2025
Merged

clippy fixes and code simplification#148211
bors merged 1 commit intorust-lang:masterfrom
hkBst:clippy-fix-13

Conversation

@hkBst
Copy link
Member

@hkBst hkBst commented Oct 28, 2025

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2025

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@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. labels Oct 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2025

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

nnethercote
nnethercote approved these changes Oct 29, 2025
View reviewed changes
Copy link
Contributor

@nnethercote nnethercote left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good except for the two cases mentioned below.

View changes since this review

compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs Outdated
* - because `(Option<Vec<i32>, bool)` needs `Option<Vec<i32>>: Copy` because `impl <A: Copy, B: Copy> Copy for (A, B)`
* - want `Vec<i32>: Copy`
* - because `Option<Vec<i32>>: Copy` needs `Vec<i32>: Copy` because `impl <T: Copy> Copy for Option<T>`
* - because `(Option<Vec<i32>, bool)` needs `Option<Vec<i32>>: Copy` because `impl <A: Copy, B: Copy> Copy for (A, B)`
Copy link
Contributor

@nnethercote nnethercote Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A single space indent here seems worse.

Copy link
Member Author

@hkBst hkBst Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very well, I will revert such changes.

compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs Outdated
/// - in_ty: `(Option<Vec<T>, bool)`
/// - expr: `(Some(vec![1, 2, 3]), false)`
/// - param: `T`
/// - in_ty: `(Option<Vec<T>, bool)`
Copy link
Contributor

@nnethercote nnethercote Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@nnethercote
Copy link
Contributor

nnethercote commented Oct 29, 2025

@bors delegate=hkBst

@bors
Copy link
Collaborator

bors commented Oct 29, 2025

✌️ @hkBst, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@hkBst
Copy link
Member Author

hkBst commented Nov 2, 2025

@bors r=@nnethercote

@bors
Copy link
Collaborator

bors commented Nov 2, 2025

📌 Commit 9e4ec2a has been approved by nnethercote

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 2, 2025
@matthiaskrgr
Rollup merge of rust-lang#148211 - hkBst:clippy-fix-13, r=nnethercote
5dde2d1 
clippy fixes and code simplification
This was referenced Nov 2, 2025
Closed
Merged
bors added a commit that referenced this pull request Nov 2, 2025
@bors
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
c5dabe8 
Rollup of 7 pull requests

Successful merges:

 - #146573 (Constify Range functions)
 - #146699 (Add `is_ascii` function optimized for LoongArch64 for [u8])
 - #148026 (std: don't leak the thread closure if destroying the thread attributes fails)
 - #148135 (Ignore unix socket related tests for VxWorks)
 - #148211 (clippy fixes and code simplification)
 - #148395 (Generalize branch references)
 - #148405 (Fix suggestion when there were a colon already in generics)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 49692e1 into rust-lang:master Nov 3, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 3, 2025
rust-timer added a commit that referenced this pull request Nov 3, 2025
@rust-timer
Unrolled build for #148211
54fad12 
Rollup merge of #148211 - hkBst:clippy-fix-13, r=nnethercote

clippy fixes and code simplification
github-actions bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Nov 3, 2025
@bors
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
3214048 
Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#146573 (Constify Range functions)
 - rust-lang/rust#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8])
 - rust-lang/rust#148026 (std: don't leak the thread closure if destroying the thread attributes fails)
 - rust-lang/rust#148135 (Ignore unix socket related tests for VxWorks)
 - rust-lang/rust#148211 (clippy fixes and code simplification)
 - rust-lang/rust#148395 (Generalize branch references)
 - rust-lang/rust#148405 (Fix suggestion when there were a colon already in generics)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Nov 3, 2025
@bors
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
d867ed0 
Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#146573 (Constify Range functions)
 - rust-lang/rust#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8])
 - rust-lang/rust#148026 (std: don't leak the thread closure if destroying the thread attributes fails)
 - rust-lang/rust#148135 (Ignore unix socket related tests for VxWorks)
 - rust-lang/rust#148211 (clippy fixes and code simplification)
 - rust-lang/rust#148395 (Generalize branch references)
 - rust-lang/rust#148405 (Fix suggestion when there were a colon already in generics)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Nov 3, 2025
@bors
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
deb7e87 
Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#146573 (Constify Range functions)
 - rust-lang/rust#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8])
 - rust-lang/rust#148026 (std: don't leak the thread closure if destroying the thread attributes fails)
 - rust-lang/rust#148135 (Ignore unix socket related tests for VxWorks)
 - rust-lang/rust#148211 (clippy fixes and code simplification)
 - rust-lang/rust#148395 (Generalize branch references)
 - rust-lang/rust#148405 (Fix suggestion when there were a colon already in generics)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Nov 30, 2025
@bors
Auto merge of rust-lang#148412 - matthiaskrgr:rollup-59a302x, r=matth…
79041ed 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#146573 (Constify Range functions)
 - rust-lang#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8])
 - rust-lang#148026 (std: don't leak the thread closure if destroying the thread attributes fails)
 - rust-lang#148135 (Ignore unix socket related tests for VxWorks)
 - rust-lang#148211 (clippy fixes and code simplification)
 - rust-lang#148395 (Generalize branch references)
 - rust-lang#148405 (Fix suggestion when there were a colon already in generics)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nnethercote nnethercote nnethercote approved these changes

@petrochenkov petrochenkov petrochenkov approved these changes

Assignees

@petrochenkov petrochenkov

Labels

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.

Projects

None yet

Milestone

1.93.0

Development

Successfully merging this pull request may close these issues.

5 participants

@hkBst @rustbot @nnethercote @bors @petrochenkov