More sophisticated span trimming

compiler-errors · compiler-errors · commit fef0ea905acb · 2025-02-21T00:41:17.000Z
diff --git a/tests/ui/borrow_deref_ref_unfixable.stderr b/tests/ui/borrow_deref_ref_unfixable.stderr
@@ -13,9 +13,8 @@ LL +         let x: &str = s;
    |
 help: if you would like to deref, try using `&**`
    |
-LL -         let x: &str = &*s;
-LL +         let x: &str = &**s;
-   |
+LL |         let x: &str = &**s;
+   |                         +
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/fn_to_numeric_cast_any.stderr b/tests/ui/fn_to_numeric_cast_any.stderr
@@ -8,9 +8,8 @@ LL |     let _ = foo as i8;
    = help: to override `-D warnings` add `#[allow(clippy::fn_to_numeric_cast_any)]`
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as i8;
-LL +     let _ = foo() as i8;
-   |
+LL |     let _ = foo() as i8;
+   |                ++
 
 error: casting function pointer `foo` to `i16`
   --> tests/ui/fn_to_numeric_cast_any.rs:26:13
@@ -20,9 +19,8 @@ LL |     let _ = foo as i16;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as i16;
-LL +     let _ = foo() as i16;
-   |
+LL |     let _ = foo() as i16;
+   |                ++
 
 error: casting function pointer `foo` to `i32`
   --> tests/ui/fn_to_numeric_cast_any.rs:28:13
@@ -32,9 +30,8 @@ LL |     let _ = foo as i32;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as i32;
-LL +     let _ = foo() as i32;
-   |
+LL |     let _ = foo() as i32;
+   |                ++
 
 error: casting function pointer `foo` to `i64`
   --> tests/ui/fn_to_numeric_cast_any.rs:30:13
@@ -44,9 +41,8 @@ LL |     let _ = foo as i64;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as i64;
-LL +     let _ = foo() as i64;
-   |
+LL |     let _ = foo() as i64;
+   |                ++
 
 error: casting function pointer `foo` to `i128`
   --> tests/ui/fn_to_numeric_cast_any.rs:32:13
@@ -56,9 +52,8 @@ LL |     let _ = foo as i128;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as i128;
-LL +     let _ = foo() as i128;
-   |
+LL |     let _ = foo() as i128;
+   |                ++
 
 error: casting function pointer `foo` to `isize`
   --> tests/ui/fn_to_numeric_cast_any.rs:34:13
@@ -68,9 +63,8 @@ LL |     let _ = foo as isize;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as isize;
-LL +     let _ = foo() as isize;
-   |
+LL |     let _ = foo() as isize;
+   |                ++
 
 error: casting function pointer `foo` to `u8`
   --> tests/ui/fn_to_numeric_cast_any.rs:37:13
@@ -80,9 +74,8 @@ LL |     let _ = foo as u8;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as u8;
-LL +     let _ = foo() as u8;
-   |
+LL |     let _ = foo() as u8;
+   |                ++
 
 error: casting function pointer `foo` to `u16`
   --> tests/ui/fn_to_numeric_cast_any.rs:39:13
@@ -92,9 +85,8 @@ LL |     let _ = foo as u16;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as u16;
-LL +     let _ = foo() as u16;
-   |
+LL |     let _ = foo() as u16;
+   |                ++
 
 error: casting function pointer `foo` to `u32`
   --> tests/ui/fn_to_numeric_cast_any.rs:41:13
@@ -104,9 +96,8 @@ LL |     let _ = foo as u32;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as u32;
-LL +     let _ = foo() as u32;
-   |
+LL |     let _ = foo() as u32;
+   |                ++
 
 error: casting function pointer `foo` to `u64`
   --> tests/ui/fn_to_numeric_cast_any.rs:43:13
@@ -116,9 +107,8 @@ LL |     let _ = foo as u64;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as u64;
-LL +     let _ = foo() as u64;
-   |
+LL |     let _ = foo() as u64;
+   |                ++
 
 error: casting function pointer `foo` to `u128`
   --> tests/ui/fn_to_numeric_cast_any.rs:45:13
@@ -128,9 +118,8 @@ LL |     let _ = foo as u128;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as u128;
-LL +     let _ = foo() as u128;
-   |
+LL |     let _ = foo() as u128;
+   |                ++
 
 error: casting function pointer `foo` to `usize`
   --> tests/ui/fn_to_numeric_cast_any.rs:47:13
@@ -140,9 +129,8 @@ LL |     let _ = foo as usize;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as usize;
-LL +     let _ = foo() as usize;
-   |
+LL |     let _ = foo() as usize;
+   |                ++
 
 error: casting function pointer `Struct::static_method` to `usize`
   --> tests/ui/fn_to_numeric_cast_any.rs:52:13
@@ -152,9 +140,8 @@ LL |     let _ = Struct::static_method as usize;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = Struct::static_method as usize;
-LL +     let _ = Struct::static_method() as usize;
-   |
+LL |     let _ = Struct::static_method() as usize;
+   |                                  ++
 
 error: casting function pointer `f` to `usize`
   --> tests/ui/fn_to_numeric_cast_any.rs:57:5
@@ -164,8 +151,7 @@ LL |     f as usize
    |
 help: did you mean to invoke the function?
    |
-LL -     f as usize
-LL +     f() as usize
+LL |     f() as usize
    |
 
 error: casting function pointer `T::static_method` to `usize`
@@ -176,8 +162,7 @@ LL |     T::static_method as usize
    |
 help: did you mean to invoke the function?
    |
-LL -     T::static_method as usize
-LL +     T::static_method() as usize
+LL |     T::static_method() as usize
    |
 
 error: casting function pointer `(clos as fn(u32) -> u32)` to `usize`
@@ -188,9 +173,8 @@ LL |     let _ = (clos as fn(u32) -> u32) as usize;
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = (clos as fn(u32) -> u32) as usize;
-LL +     let _ = (clos as fn(u32) -> u32)() as usize;
-   |
+LL |     let _ = (clos as fn(u32) -> u32)() as usize;
+   |                                     ++
 
 error: casting function pointer `foo` to `*const ()`
   --> tests/ui/fn_to_numeric_cast_any.rs:74:13
@@ -200,9 +184,8 @@ LL |     let _ = foo as *const ();
    |
 help: did you mean to invoke the function?
    |
-LL -     let _ = foo as *const ();
-LL +     let _ = foo() as *const ();
-   |
+LL |     let _ = foo() as *const ();
+   |                ++
 
 error: aborting due to 17 previous errors
 
diff --git a/tests/ui/implicit_hasher.stderr b/tests/ui/implicit_hasher.stderr
@@ -78,9 +78,8 @@ LL | pub fn map(map: &mut HashMap<i32, i32>) {}
    |
 help: add a type parameter for `BuildHasher`
    |
-LL - pub fn map(map: &mut HashMap<i32, i32>) {}
-LL + pub fn map<S: ::std::hash::BuildHasher>(map: &mut HashMap<i32, i32, S>) {}
-   |
+LL | pub fn map<S: ::std::hash::BuildHasher>(map: &mut HashMap<i32, i32, S>) {}
+   |           +++++++++++++++++++++++++++++                           +++
 
 error: parameter of type `HashSet` should be generalized over different hashers
   --> tests/ui/implicit_hasher.rs:70:22
@@ -90,9 +89,8 @@ LL | pub fn set(set: &mut HashSet<i32>) {}
    |
 help: add a type parameter for `BuildHasher`
    |
-LL - pub fn set(set: &mut HashSet<i32>) {}
-LL + pub fn set<S: ::std::hash::BuildHasher>(set: &mut HashSet<i32, S>) {}
-   |
+LL | pub fn set<S: ::std::hash::BuildHasher>(set: &mut HashSet<i32, S>) {}
+   |           +++++++++++++++++++++++++++++                      +++
 
 error: impl for `HashMap` should be generalized over different hashers
   --> tests/ui/implicit_hasher.rs:76:43
@@ -116,9 +114,8 @@ LL | pub async fn election_vote(_data: HashMap<i32, i32>) {}
    |
 help: add a type parameter for `BuildHasher`
    |
-LL - pub async fn election_vote(_data: HashMap<i32, i32>) {}
-LL + pub async fn election_vote<S: ::std::hash::BuildHasher>(_data: HashMap<i32, i32, S>) {}
-   |
+LL | pub async fn election_vote<S: ::std::hash::BuildHasher>(_data: HashMap<i32, i32, S>) {}
+   |                           +++++++++++++++++++++++++++++                        +++
 
 error: aborting due to 9 previous errors
 
diff --git a/tests/ui/literals.stderr b/tests/ui/literals.stderr
@@ -99,9 +99,8 @@ LL +     let fail8 = 123;
    |
 help: if you mean to use an octal constant, use `0o`
    |
-LL -     let fail8 = 0123;
-LL +     let fail8 = 0o123;
-   |
+LL |     let fail8 = 0o123;
+   |                  +
 
 error: integer type suffix should not be separated by an underscore
   --> tests/ui/literals.rs:48:16
diff --git a/tests/ui/octal_escapes.stderr b/tests/ui/octal_escapes.stderr
diff --git a/tests/ui/suspicious_to_owned.stderr b/tests/ui/suspicious_to_owned.stderr

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ LL + let x: &str = s;`
`13`	`13`	`\|`
`14`	`14`	help: if you would like to deref, try using `&**`
`15`	`15`	`\|`
`16`		`-LL - let x: &str = &*s;`
`17`		`-LL + let x: &str = &**s;`
`18`		`- \|`
	`16`	`+LL \| let x: &str = &**s;`
	`17`	`+ \| +`
`19`	`18`
`20`	`19`	`error: aborting due to 1 previous error`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,8 @@ LL \| let _ = foo as i8;`
`8`	`8`	= help: to override `-D warnings` add `#[allow(clippy::fn_to_numeric_cast_any)]`
`9`	`9`	`help: did you mean to invoke the function?`
`10`	`10`	`\|`
`11`		`-LL - let _ = foo as i8;`
`12`		`-LL + let _ = foo() as i8;`
`13`		`- \|`
	`11`	`+LL \| let _ = foo() as i8;`
	`12`	`+ \| ++`
`14`	`13`
`15`	`14`	error: casting function pointer `foo` to `i16`
`16`	`15`	`--> tests/ui/fn_to_numeric_cast_any.rs:26:13`
`@@ -20,9 +19,8 @@ LL \| let _ = foo as i16;`
`20`	`19`	`\|`
`21`	`20`	`help: did you mean to invoke the function?`
`22`	`21`	`\|`
`23`		`-LL - let _ = foo as i16;`
`24`		`-LL + let _ = foo() as i16;`
`25`		`- \|`
	`22`	`+LL \| let _ = foo() as i16;`
	`23`	`+ \| ++`
`26`	`24`
`27`	`25`	error: casting function pointer `foo` to `i32`
`28`	`26`	`--> tests/ui/fn_to_numeric_cast_any.rs:28:13`
`@@ -32,9 +30,8 @@ LL \| let _ = foo as i32;`
`32`	`30`	`\|`
`33`	`31`	`help: did you mean to invoke the function?`
`34`	`32`	`\|`
`35`		`-LL - let _ = foo as i32;`
`36`		`-LL + let _ = foo() as i32;`
`37`		`- \|`
	`33`	`+LL \| let _ = foo() as i32;`
	`34`	`+ \| ++`
`38`	`35`
`39`	`36`	error: casting function pointer `foo` to `i64`
`40`	`37`	`--> tests/ui/fn_to_numeric_cast_any.rs:30:13`
`@@ -44,9 +41,8 @@ LL \| let _ = foo as i64;`
`44`	`41`	`\|`
`45`	`42`	`help: did you mean to invoke the function?`
`46`	`43`	`\|`
`47`		`-LL - let _ = foo as i64;`
`48`		`-LL + let _ = foo() as i64;`
`49`		`- \|`
	`44`	`+LL \| let _ = foo() as i64;`
	`45`	`+ \| ++`
`50`	`46`
`51`	`47`	error: casting function pointer `foo` to `i128`
`52`	`48`	`--> tests/ui/fn_to_numeric_cast_any.rs:32:13`
`@@ -56,9 +52,8 @@ LL \| let _ = foo as i128;`
`56`	`52`	`\|`
`57`	`53`	`help: did you mean to invoke the function?`
`58`	`54`	`\|`
`59`		`-LL - let _ = foo as i128;`
`60`		`-LL + let _ = foo() as i128;`
`61`		`- \|`
	`55`	`+LL \| let _ = foo() as i128;`
	`56`	`+ \| ++`
`62`	`57`
`63`	`58`	error: casting function pointer `foo` to `isize`
`64`	`59`	`--> tests/ui/fn_to_numeric_cast_any.rs:34:13`
`@@ -68,9 +63,8 @@ LL \| let _ = foo as isize;`
`68`	`63`	`\|`
`69`	`64`	`help: did you mean to invoke the function?`
`70`	`65`	`\|`
`71`		`-LL - let _ = foo as isize;`
`72`		`-LL + let _ = foo() as isize;`
`73`		`- \|`
	`66`	`+LL \| let _ = foo() as isize;`
	`67`	`+ \| ++`
`74`	`68`
`75`	`69`	error: casting function pointer `foo` to `u8`
`76`	`70`	`--> tests/ui/fn_to_numeric_cast_any.rs:37:13`
`@@ -80,9 +74,8 @@ LL \| let _ = foo as u8;`
`80`	`74`	`\|`
`81`	`75`	`help: did you mean to invoke the function?`
`82`	`76`	`\|`
`83`		`-LL - let _ = foo as u8;`
`84`		`-LL + let _ = foo() as u8;`
`85`		`- \|`
	`77`	`+LL \| let _ = foo() as u8;`
	`78`	`+ \| ++`
`86`	`79`
`87`	`80`	error: casting function pointer `foo` to `u16`
`88`	`81`	`--> tests/ui/fn_to_numeric_cast_any.rs:39:13`
`@@ -92,9 +85,8 @@ LL \| let _ = foo as u16;`
`92`	`85`	`\|`
`93`	`86`	`help: did you mean to invoke the function?`
`94`	`87`	`\|`
`95`		`-LL - let _ = foo as u16;`
`96`		`-LL + let _ = foo() as u16;`
`97`		`- \|`
	`88`	`+LL \| let _ = foo() as u16;`
	`89`	`+ \| ++`
`98`	`90`
`99`	`91`	error: casting function pointer `foo` to `u32`
`100`	`92`	`--> tests/ui/fn_to_numeric_cast_any.rs:41:13`
`@@ -104,9 +96,8 @@ LL \| let _ = foo as u32;`
`104`	`96`	`\|`
`105`	`97`	`help: did you mean to invoke the function?`
`106`	`98`	`\|`
`107`		`-LL - let _ = foo as u32;`
`108`		`-LL + let _ = foo() as u32;`
`109`		`- \|`
	`99`	`+LL \| let _ = foo() as u32;`
	`100`	`+ \| ++`
`110`	`101`
`111`	`102`	error: casting function pointer `foo` to `u64`
`112`	`103`	`--> tests/ui/fn_to_numeric_cast_any.rs:43:13`
`@@ -116,9 +107,8 @@ LL \| let _ = foo as u64;`
`116`	`107`	`\|`
`117`	`108`	`help: did you mean to invoke the function?`
`118`	`109`	`\|`
`119`		`-LL - let _ = foo as u64;`
`120`		`-LL + let _ = foo() as u64;`
`121`		`- \|`
	`110`	`+LL \| let _ = foo() as u64;`
	`111`	`+ \| ++`
`122`	`112`
`123`	`113`	error: casting function pointer `foo` to `u128`
`124`	`114`	`--> tests/ui/fn_to_numeric_cast_any.rs:45:13`
`@@ -128,9 +118,8 @@ LL \| let _ = foo as u128;`
`128`	`118`	`\|`
`129`	`119`	`help: did you mean to invoke the function?`
`130`	`120`	`\|`
`131`		`-LL - let _ = foo as u128;`
`132`		`-LL + let _ = foo() as u128;`
`133`		`- \|`
	`121`	`+LL \| let _ = foo() as u128;`
	`122`	`+ \| ++`
`134`	`123`
`135`	`124`	error: casting function pointer `foo` to `usize`
`136`	`125`	`--> tests/ui/fn_to_numeric_cast_any.rs:47:13`
`@@ -140,9 +129,8 @@ LL \| let _ = foo as usize;`
`140`	`129`	`\|`
`141`	`130`	`help: did you mean to invoke the function?`
`142`	`131`	`\|`
`143`		`-LL - let _ = foo as usize;`
`144`		`-LL + let _ = foo() as usize;`
`145`		`- \|`
	`132`	`+LL \| let _ = foo() as usize;`
	`133`	`+ \| ++`
`146`	`134`
`147`	`135`	error: casting function pointer `Struct::static_method` to `usize`
`148`	`136`	`--> tests/ui/fn_to_numeric_cast_any.rs:52:13`
`@@ -152,9 +140,8 @@ LL \| let _ = Struct::static_method as usize;`
`152`	`140`	`\|`
`153`	`141`	`help: did you mean to invoke the function?`
`154`	`142`	`\|`
`155`		`-LL - let _ = Struct::static_method as usize;`
`156`		`-LL + let _ = Struct::static_method() as usize;`
`157`		`- \|`
	`143`	`+LL \| let _ = Struct::static_method() as usize;`
	`144`	`+ \| ++`
`158`	`145`
`159`	`146`	error: casting function pointer `f` to `usize`
`160`	`147`	`--> tests/ui/fn_to_numeric_cast_any.rs:57:5`
`@@ -164,8 +151,7 @@ LL \| f as usize`
`164`	`151`	`\|`
`165`	`152`	`help: did you mean to invoke the function?`
`166`	`153`	`\|`
`167`		`-LL - f as usize`
`168`		`-LL + f() as usize`
	`154`	`+LL \| f() as usize`
`169`	`155`	`\|`
`170`	`156`
`171`	`157`	error: casting function pointer `T::static_method` to `usize`
`@@ -176,8 +162,7 @@ LL \| T::static_method as usize`
`176`	`162`	`\|`
`177`	`163`	`help: did you mean to invoke the function?`
`178`	`164`	`\|`
`179`		`-LL - T::static_method as usize`
`180`		`-LL + T::static_method() as usize`
	`165`	`+LL \| T::static_method() as usize`
`181`	`166`	`\|`
`182`	`167`
`183`	`168`	error: casting function pointer `(clos as fn(u32) -> u32)` to `usize`
`@@ -188,9 +173,8 @@ LL \| let _ = (clos as fn(u32) -> u32) as usize;`
`188`	`173`	`\|`
`189`	`174`	`help: did you mean to invoke the function?`
`190`	`175`	`\|`
`191`		`-LL - let _ = (clos as fn(u32) -> u32) as usize;`
`192`		`-LL + let _ = (clos as fn(u32) -> u32)() as usize;`
`193`		`- \|`
	`176`	`+LL \| let _ = (clos as fn(u32) -> u32)() as usize;`
	`177`	`+ \| ++`
`194`	`178`
`195`	`179`	error: casting function pointer `foo` to `*const ()`
`196`	`180`	`--> tests/ui/fn_to_numeric_cast_any.rs:74:13`
`@@ -200,9 +184,8 @@ LL \| let _ = foo as *const ();`
`200`	`184`	`\|`
`201`	`185`	`help: did you mean to invoke the function?`
`202`	`186`	`\|`
`203`		`-LL - let _ = foo as *const ();`
`204`		`-LL + let _ = foo() as *const ();`
`205`		`- \|`
	`187`	`+LL \| let _ = foo() as *const ();`
	`188`	`+ \| ++`
`206`	`189`
`207`	`190`	`error: aborting due to 17 previous errors`
`208`	`191`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,8 @@ LL \| pub fn map(map: &mut HashMap<i32, i32>) {}`
`78`	`78`	`\|`
`79`	`79`	help: add a type parameter for `BuildHasher`
`80`	`80`	`\|`
`81`		`-LL - pub fn map(map: &mut HashMap<i32, i32>) {}`
`82`		`-LL + pub fn map<S: ::std::hash::BuildHasher>(map: &mut HashMap<i32, i32, S>) {}`
`83`		`- \|`
	`81`	`+LL \| pub fn map<S: ::std::hash::BuildHasher>(map: &mut HashMap<i32, i32, S>) {}`
	`82`	`+ \| +++++++++++++++++++++++++++++ +++`
`84`	`83`
`85`	`84`	error: parameter of type `HashSet` should be generalized over different hashers
`86`	`85`	`--> tests/ui/implicit_hasher.rs:70:22`
`@@ -90,9 +89,8 @@ LL \| pub fn set(set: &mut HashSet<i32>) {}`
`90`	`89`	`\|`
`91`	`90`	help: add a type parameter for `BuildHasher`
`92`	`91`	`\|`
`93`		`-LL - pub fn set(set: &mut HashSet<i32>) {}`
`94`		`-LL + pub fn set<S: ::std::hash::BuildHasher>(set: &mut HashSet<i32, S>) {}`
`95`		`- \|`
	`92`	`+LL \| pub fn set<S: ::std::hash::BuildHasher>(set: &mut HashSet<i32, S>) {}`
	`93`	`+ \| +++++++++++++++++++++++++++++ +++`
`96`	`94`
`97`	`95`	error: impl for `HashMap` should be generalized over different hashers
`98`	`96`	`--> tests/ui/implicit_hasher.rs:76:43`
`@@ -116,9 +114,8 @@ LL \| pub async fn election_vote(_data: HashMap<i32, i32>) {}`
`116`	`114`	`\|`
`117`	`115`	help: add a type parameter for `BuildHasher`
`118`	`116`	`\|`
`119`		`-LL - pub async fn election_vote(_data: HashMap<i32, i32>) {}`
`120`		`-LL + pub async fn election_vote<S: ::std::hash::BuildHasher>(_data: HashMap<i32, i32, S>) {}`
`121`		`- \|`
	`117`	`+LL \| pub async fn election_vote<S: ::std::hash::BuildHasher>(_data: HashMap<i32, i32, S>) {}`
	`118`	`+ \| +++++++++++++++++++++++++++++ +++`
`122`	`119`
`123`	`120`	`error: aborting due to 9 previous errors`
`124`	`121`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,8 @@ LL + let fail8 = 123;`
`99`	`99`	`\|`
`100`	`100`	help: if you mean to use an octal constant, use `0o`
`101`	`101`	`\|`
`102`		`-LL - let fail8 = 0123;`
`103`		`-LL + let fail8 = 0o123;`
`104`		`- \|`
	`102`	`+LL \| let fail8 = 0o123;`
	`103`	`+ \| +`
`105`	`104`
`106`	`105`	`error: integer type suffix should not be separated by an underscore`
`107`	`106`	`--> tests/ui/literals.rs:48:16`