Auto merge of #109786 - estebank:tweak-add-line-sugg, r=compiler-errors

bors · bors · commit 57c49d68fc0d · 2023-04-13T07:02:53.000Z
Tweak output for 'add line' suggestion

Closes #108174
diff --git a/tests/ui/crashes/ice-6252.stderr b/tests/ui/crashes/ice-6252.stderr
@@ -6,11 +6,11 @@ LL |     _n: PhantomData,
    |
 help: consider importing one of these items
    |
-LL | use core::marker::PhantomData;
+LL + use core::marker::PhantomData;
    |
-LL | use serde::__private::PhantomData;
+LL + use serde::__private::PhantomData;
    |
-LL | use std::marker::PhantomData;
+LL + use std::marker::PhantomData;
    |
 
 error[E0412]: cannot find type `VAL` in this scope
diff --git a/tests/ui/derivable_impls.stderr b/tests/ui/derivable_impls.stderr
@@ -14,7 +14,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct FooDefault<'a> {
    |
 
 error: this `impl` can be derived
@@ -30,7 +31,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct TupleDefault(bool, i32, u64);
    |
 
 error: this `impl` can be derived
@@ -46,7 +48,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct StrDefault<'a>(&'a str);
    |
 
 error: this `impl` can be derived
@@ -62,7 +65,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct Y(u32);
    |
 
 error: this `impl` can be derived
@@ -78,7 +82,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct WithoutSelfCurly {
    |
 
 error: this `impl` can be derived
@@ -94,7 +99,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | struct WithoutSelfParan(bool);
    |
 
 error: this `impl` can be derived
@@ -110,7 +116,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | pub struct RepeatDefault1 {
    |
 
 error: this `impl` can be derived
@@ -126,7 +133,8 @@ LL | | }
    = help: remove the manual implementation...
 help: ...and instead derive it...
    |
-LL | #[derive(Default)]
+LL + #[derive(Default)]
+LL | pub enum SimpleEnum {
    |
 help: ...and mark the default variant
    |

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ LL \| _n: PhantomData,`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing one of these items`
`8`	`8`	`\|`
`9`		`-LL \| use core::marker::PhantomData;`
	`9`	`+LL + use core::marker::PhantomData;`
`10`	`10`	`\|`
`11`		`-LL \| use serde::__private::PhantomData;`
	`11`	`+LL + use serde::__private::PhantomData;`
`12`	`12`	`\|`
`13`		`-LL \| use std::marker::PhantomData;`
	`13`	`+LL + use std::marker::PhantomData;`
`14`	`14`	`\|`
`15`	`15`
`16`	`16`	error[E0412]: cannot find type `VAL` in this scope
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ LL \| \| }`
`14`	`14`	`= help: remove the manual implementation...`
`15`	`15`	`help: ...and instead derive it`
`16`	`16`	`\|`
`17`		`-LL \| #[derive(Default)]`
	`17`	`+LL + #[derive(Default)]`
	`18`	`+LL \| struct FooDefault<'a> {`
`18`	`19`	`\|`
`19`	`20`
`20`	`21`	error: this `impl` can be derived
`@@ -30,7 +31,8 @@ LL \| \| }`
`30`	`31`	`= help: remove the manual implementation...`
`31`	`32`	`help: ...and instead derive it`
`32`	`33`	`\|`
`33`		`-LL \| #[derive(Default)]`
	`34`	`+LL + #[derive(Default)]`
	`35`	`+LL \| struct TupleDefault(bool, i32, u64);`
`34`	`36`	`\|`
`35`	`37`
`36`	`38`	error: this `impl` can be derived
`@@ -46,7 +48,8 @@ LL \| \| }`
`46`	`48`	`= help: remove the manual implementation...`
`47`	`49`	`help: ...and instead derive it`
`48`	`50`	`\|`
`49`		`-LL \| #[derive(Default)]`
	`51`	`+LL + #[derive(Default)]`
	`52`	`+LL \| struct StrDefault<'a>(&'a str);`
`50`	`53`	`\|`
`51`	`54`
`52`	`55`	error: this `impl` can be derived
`@@ -62,7 +65,8 @@ LL \| \| }`
`62`	`65`	`= help: remove the manual implementation...`
`63`	`66`	`help: ...and instead derive it`
`64`	`67`	`\|`
`65`		`-LL \| #[derive(Default)]`
	`68`	`+LL + #[derive(Default)]`
	`69`	`+LL \| struct Y(u32);`
`66`	`70`	`\|`
`67`	`71`
`68`	`72`	error: this `impl` can be derived
`@@ -78,7 +82,8 @@ LL \| \| }`
`78`	`82`	`= help: remove the manual implementation...`
`79`	`83`	`help: ...and instead derive it`
`80`	`84`	`\|`
`81`		`-LL \| #[derive(Default)]`
	`85`	`+LL + #[derive(Default)]`
	`86`	`+LL \| struct WithoutSelfCurly {`
`82`	`87`	`\|`
`83`	`88`
`84`	`89`	error: this `impl` can be derived
`@@ -94,7 +99,8 @@ LL \| \| }`
`94`	`99`	`= help: remove the manual implementation...`
`95`	`100`	`help: ...and instead derive it`
`96`	`101`	`\|`
`97`		`-LL \| #[derive(Default)]`
	`102`	`+LL + #[derive(Default)]`
	`103`	`+LL \| struct WithoutSelfParan(bool);`
`98`	`104`	`\|`
`99`	`105`
`100`	`106`	error: this `impl` can be derived
`@@ -110,7 +116,8 @@ LL \| \| }`
`110`	`116`	`= help: remove the manual implementation...`
`111`	`117`	`help: ...and instead derive it`
`112`	`118`	`\|`
`113`		`-LL \| #[derive(Default)]`
	`119`	`+LL + #[derive(Default)]`
	`120`	`+LL \| pub struct RepeatDefault1 {`
`114`	`121`	`\|`
`115`	`122`
`116`	`123`	error: this `impl` can be derived
`@@ -126,7 +133,8 @@ LL \| \| }`
`126`	`133`	`= help: remove the manual implementation...`
`127`	`134`	`help: ...and instead derive it...`
`128`	`135`	`\|`
`129`		`-LL \| #[derive(Default)]`
	`136`	`+LL + #[derive(Default)]`
	`137`	`+LL \| pub enum SimpleEnum {`
`130`	`138`	`\|`
`131`	`139`	`help: ...and mark the default variant`
`132`	`140`	`\|`