fix(elidable_lifetime_names): avoid overlapping spans in suggestions #15667
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @Alexendoo rustbot has assigned @Alexendoo. Use |
f4f156f to
aa1cea1
Compare
ada4a
commented
Sep 12, 2025
Comment on lines
+859
to
+864
| if !elidable_lts | ||
| .iter() | ||
| .all(|lt| explicit_params.iter().any(|param| param.def_id == *lt)) | ||
| { | ||
| return None; | ||
| } |
There was a problem hiding this comment.
This function used to return None in a lot of places which would realistically never fail. I think let pos = explicit_params.iter().position(|param| param.def_id == id)?; was the only exception, because it effectively made sure that all elidable_lts were actually present in explicit_params, so this is the check I added to replace that
aa1cea1 to
a817c89
Compare
samueltardieu
requested changes
Sep 14, 2025
clippy_lints/src/lifetimes.rs
Outdated
Comment on lines
885
to
903
| [first, second] => { | ||
| // NOTE: we could theoretically remove this case for the next one, | ||
| // but the latter likely has quite a lot of overhead, so don't | ||
| match ( | ||
| elidable_lts.contains(&first.def_id), | ||
| elidable_lts.contains(&second.def_id), | ||
| ) { | ||
| (false, false) => unreachable!("handled by `elidable_lts.is_empty()`"), | ||
| (true, true) => unreachable!("handled by `elidable_lts.len() == explicit_params.len()`"), | ||
|
|
||
| // <'a, 'b> -> <'a, 'b> | ||
| // ^^ ^^^^ | ||
| (false, true) => vec![(second.span.with_lo(first.span.hi()), String::new())], | ||
| // <'a, 'b> -> <'a, 'b> | ||
| // ^^ ^^^^ | ||
| (true, false) => vec![(first.span.until(second.span), String::new())], | ||
| } | ||
| }, | ||
| // Time for the big guns |
There was a problem hiding this comment.
I would remove this, as this is not on the hot path: it is called only when actually emitting the suggestion, and in this case we do not care much about some extra overhead.
Suggested change
| [first, second] => { | |
| // NOTE: we could theoretically remove this case for the next one, | |
| // but the latter likely has quite a lot of overhead, so don't | |
| match ( | |
| elidable_lts.contains(&first.def_id), | |
| elidable_lts.contains(&second.def_id), | |
| ) { | |
| (false, false) => unreachable!("handled by `elidable_lts.is_empty()`"), | |
| (true, true) => unreachable!("handled by `elidable_lts.len() == explicit_params.len()`"), | |
| // <'a, 'b> -> <'a, 'b> | |
| // ^^ ^^^^ | |
| (false, true) => vec![(second.span.with_lo(first.span.hi()), String::new())], | |
| // <'a, 'b> -> <'a, 'b> | |
| // ^^ ^^^^ | |
| (true, false) => vec![(first.span.until(second.span), String::new())], | |
| } | |
| }, | |
| // Time for the big guns |
|
Reminder, once the PR becomes ready for a review, use |
a817c89 to
25881bf
Compare
samueltardieu
approved these changes
Sep 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #14157
Fixes #15666
changelog: [
elidable_lifetime_names]: avoid overlapping spans in suggestionsr? clippy