Properly handle removal suggestion rendering

estebank · estebank · commit 9b7227cf3f20 · 2024-07-04T05:04:48.000Z
Do not leave a `+ ` line with only whitespace. In reality, the user will want to remove the entire line.
diff --git a/tests/ui/dbg_macro/dbg_macro.stderr b/tests/ui/dbg_macro/dbg_macro.stderr
@@ -86,7 +86,6 @@ LL |     dbg!();
 help: remove the invocation before committing it to a version control system
    |
 LL -     dbg!();
-LL +     
    |
 
 error: the `dbg!` macro is intended as a debugging tool
@@ -146,7 +145,6 @@ LL |     expand_to_dbg!();
 help: remove the invocation before committing it to a version control system
    |
 LL -             dbg!();
-LL +             
    |
 
 error: the `dbg!` macro is intended as a debugging tool
diff --git a/tests/ui/dbg_macro/dbg_macro_unfixable.stderr b/tests/ui/dbg_macro/dbg_macro_unfixable.stderr
@@ -9,7 +9,6 @@ LL |     dbg!();
 help: remove the invocation before committing it to a version control system
    |
 LL -     dbg!();
-LL +     
    |
 
 error: the `dbg!` macro is intended as a debugging tool
diff --git a/tests/ui/manual_split_once.stderr b/tests/ui/manual_split_once.stderr
@@ -96,12 +96,10 @@ LL |     let (l, r) = "a.b.c".split_once('.').unwrap();
 help: remove the `iter` usages
    |
 LL -     let l = iter.next().unwrap();
-LL +     
    |
 help: remove the `iter` usages
    |
 LL -     let r = iter.next().unwrap();
-LL +     
    |
 
 error: manual implementation of `split_once`
@@ -121,12 +119,10 @@ LL |     let (l, r) = "a.b.c".split_once('.')?;
 help: remove the `iter` usages
    |
 LL -     let l = iter.next()?;
-LL +     
    |
 help: remove the `iter` usages
    |
 LL -     let r = iter.next()?;
-LL +     
    |
 
 error: manual implementation of `rsplit_once`
@@ -146,12 +142,10 @@ LL |     let (l, r) = "a.b.c".rsplit_once('.').unwrap();
 help: remove the `iter` usages
    |
 LL -     let r = iter.next().unwrap();
-LL +     
    |
 help: remove the `iter` usages
    |
 LL -     let l = iter.next().unwrap();
-LL +     
    |
 
 error: manual implementation of `rsplit_once`
@@ -171,12 +165,10 @@ LL |     let (l, r) = "a.b.c".rsplit_once('.')?;
 help: remove the `iter` usages
    |
 LL -     let r = iter.next()?;
-LL +     
    |
 help: remove the `iter` usages
    |
 LL -     let l = iter.next()?;
-LL +     
    |
 
 error: manual implementation of `split_once`
@@ -202,12 +194,10 @@ LL |     let (a, b) = "a.b.c".split_once('.').unwrap();
 help: remove the `iter` usages
    |
 LL -     let a = iter.next().unwrap();
-LL +     
    |
 help: remove the `iter` usages
    |
 LL -     let b = iter.next().unwrap();
-LL +     
    |
 
 error: aborting due to 19 previous errors
diff --git a/tests/ui/significant_drop_tightening.stderr b/tests/ui/significant_drop_tightening.stderr
@@ -64,7 +64,6 @@ LL +         let rslt0 = mutex.lock().unwrap().abs();
 help: remove separated single usage
    |
 LL -         let rslt0 = lock.abs();
-LL +         
    |
 
 error: temporary with significant `Drop` can be early dropped
@@ -88,7 +87,6 @@ LL +         mutex.lock().unwrap().clear();
 help: remove separated single usage
    |
 LL -         lock.clear();
-LL +         
    |
 
 error: aborting due to 4 previous errors

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ LL \| dbg!();`
`86`	`86`	`help: remove the invocation before committing it to a version control system`
`87`	`87`	`\|`
`88`	`88`	`LL - dbg!();`
`89`		`-LL +`
`90`	`89`	`\|`
`91`	`90`
`92`	`91`	error: the `dbg!` macro is intended as a debugging tool
`@@ -146,7 +145,6 @@ LL \| expand_to_dbg!();`
`146`	`145`	`help: remove the invocation before committing it to a version control system`
`147`	`146`	`\|`
`148`	`147`	`LL - dbg!();`
`149`		`-LL +`
`150`	`148`	`\|`
`151`	`149`
`152`	`150`	error: the `dbg!` macro is intended as a debugging tool
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ LL \| dbg!();`
`9`	`9`	`help: remove the invocation before committing it to a version control system`
`10`	`10`	`\|`
`11`	`11`	`LL - dbg!();`
`12`		`-LL +`
`13`	`12`	`\|`
`14`	`13`
`15`	`14`	error: the `dbg!` macro is intended as a debugging tool
Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,10 @@ LL \| let (l, r) = "a.b.c".split_once('.').unwrap();`
`96`	`96`	help: remove the `iter` usages
`97`	`97`	`\|`
`98`	`98`	`LL - let l = iter.next().unwrap();`
`99`		`-LL +`
`100`	`99`	`\|`
`101`	`100`	help: remove the `iter` usages
`102`	`101`	`\|`
`103`	`102`	`LL - let r = iter.next().unwrap();`
`104`		`-LL +`
`105`	`103`	`\|`
`106`	`104`
`107`	`105`	error: manual implementation of `split_once`
`@@ -121,12 +119,10 @@ LL \| let (l, r) = "a.b.c".split_once('.')?;`
`121`	`119`	help: remove the `iter` usages
`122`	`120`	`\|`
`123`	`121`	`LL - let l = iter.next()?;`
`124`		`-LL +`
`125`	`122`	`\|`
`126`	`123`	help: remove the `iter` usages
`127`	`124`	`\|`
`128`	`125`	`LL - let r = iter.next()?;`
`129`		`-LL +`
`130`	`126`	`\|`
`131`	`127`
`132`	`128`	error: manual implementation of `rsplit_once`
`@@ -146,12 +142,10 @@ LL \| let (l, r) = "a.b.c".rsplit_once('.').unwrap();`
`146`	`142`	help: remove the `iter` usages
`147`	`143`	`\|`
`148`	`144`	`LL - let r = iter.next().unwrap();`
`149`		`-LL +`
`150`	`145`	`\|`
`151`	`146`	help: remove the `iter` usages
`152`	`147`	`\|`
`153`	`148`	`LL - let l = iter.next().unwrap();`
`154`		`-LL +`
`155`	`149`	`\|`
`156`	`150`
`157`	`151`	error: manual implementation of `rsplit_once`
`@@ -171,12 +165,10 @@ LL \| let (l, r) = "a.b.c".rsplit_once('.')?;`
`171`	`165`	help: remove the `iter` usages
`172`	`166`	`\|`
`173`	`167`	`LL - let r = iter.next()?;`
`174`		`-LL +`
`175`	`168`	`\|`
`176`	`169`	help: remove the `iter` usages
`177`	`170`	`\|`
`178`	`171`	`LL - let l = iter.next()?;`
`179`		`-LL +`
`180`	`172`	`\|`
`181`	`173`
`182`	`174`	error: manual implementation of `split_once`
`@@ -202,12 +194,10 @@ LL \| let (a, b) = "a.b.c".split_once('.').unwrap();`
`202`	`194`	help: remove the `iter` usages
`203`	`195`	`\|`
`204`	`196`	`LL - let a = iter.next().unwrap();`
`205`		`-LL +`
`206`	`197`	`\|`
`207`	`198`	help: remove the `iter` usages
`208`	`199`	`\|`
`209`	`200`	`LL - let b = iter.next().unwrap();`
`210`		`-LL +`
`211`	`201`	`\|`
`212`	`202`
`213`	`203`	`error: aborting due to 19 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ LL + let rslt0 = mutex.lock().unwrap().abs();`
`64`	`64`	`help: remove separated single usage`
`65`	`65`	`\|`
`66`	`66`	`LL - let rslt0 = lock.abs();`
`67`		`-LL +`
`68`	`67`	`\|`
`69`	`68`
`70`	`69`	error: temporary with significant `Drop` can be early dropped
`@@ -88,7 +87,6 @@ LL + mutex.lock().unwrap().clear();`
`88`	`87`	`help: remove separated single usage`
`89`	`88`	`\|`
`90`	`89`	`LL - lock.clear();`
`91`		`-LL +`
`92`	`90`	`\|`
`93`	`91`
`94`	`92`	`error: aborting due to 4 previous errors`