user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt the logic from extra_unused_type_parameters

Browse source 
.. and add some docs to both of them
This commit is contained in:
Ada Alakbarova 2025-10-19 18:32:06 +02:00
parent c6426f5dd7
commit 17f194238d
No known key found for this signature in database
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
clippy_lints/src/extra_unused_type_parameters.rs
View file

@ -157,6 +157,11 @@ impl<'cx, 'tcx> TypeWalker<'cx, 'tcx> {
let spans = if explicit_params.len() == extra_params.len() {
vec![self.generics.span] // Remove the entire list of generics
} else {
// 1. Start from the last extra param
// 2. While the params preceding it are also extra, construct spans going from the current param to
// the comma before it
// 3. Once this chain of extra params stops, switch to constructing spans going from the current
// param to the comma _after_ it
let mut end: Option<LocalDefId> = None;
extra_params
.iter()

25
clippy_lints/src/lifetimes.rs
View file

@ -863,20 +863,33 @@ fn elision_suggestions(
// ^^^^
vec![(generics.span, String::new())]
} else {
// 1. Start from the last elidable lifetime
// 2. While the lifetimes preceding it are also elidable, construct spans going from the current
// lifetime to the comma before it
// 3. Once this chain of elidable lifetimes stops, switch to constructing spans going from the
// current lifetime to the comma _after_ it
let mut end: Option<LocalDefId> = None;
elidable_lts
.iter()
.rev()
.map(|&id| {
let pos = explicit_params.iter().position(|param| param.def_id == id)?;
let param = explicit_params.get(pos)?;
let (idx, param) = explicit_params.iter().find_position(|param| param.def_id == id)?;
let span = if let Some(next) = explicit_params.get(pos + 1) {
let span = if let Some(next) = explicit_params.get(idx + 1)
&& end != Some(next.def_id)
{
// Extend the current span forward, up until the next param in the list.
// fn x<'prev, 'a, 'next>() {}
// ^^^^
param.span.until(next.span)
} else {
// `pos` should be at least 1 here, because the param in position 0 would either have a `next`
// param or would have taken the `elidable_lts.len() == explicit_params.len()` branch.
let prev = explicit_params.get(pos - 1)?;
// Extend the current span back to include the comma following the previous
// param. If the span of the next param in the list has already been
// extended, we continue the chain. This is why we're iterating in reverse.
end = Some(param.def_id);
// `idx` will never be 0, else we'd be removing the entire list of generics
let prev = explicit_params.get(idx - 1)?;
// fn x<'prev, 'a>() {}
// ^^^^