needless-lifetime / fix master merge

tnielens · tnielens · commit 124420f920fd · 2020-09-29T23:06:08.000+02:00
diff --git a/tests/ui/crashes/ice-2774.stderr b/tests/ui/crashes/ice-2774.stderr
@@ -1,5 +1,5 @@
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
-  --> $DIR/ice-2774.rs:17:1
+  --> $DIR/ice-2774.rs:15:1
    |
 LL | pub fn add_barfoos_to_foos<'a>(bars: &HashSet<&'a Bar>) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/crashes/needless_lifetimes_impl_trait.stderr b/tests/ui/crashes/needless_lifetimes_impl_trait.stderr
@@ -1,11 +1,11 @@
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
-  --> $DIR/needless_lifetimes_impl_trait.rs:17:5
+  --> $DIR/needless_lifetimes_impl_trait.rs:15:5
    |
 LL |     fn baz<'a>(&'a self) -> impl Foo + 'a {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/needless_lifetimes_impl_trait.rs:3:9
+  --> $DIR/needless_lifetimes_impl_trait.rs:1:9
    |
 LL | #![deny(clippy::needless_lifetimes)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
`2`		`- --> $DIR/ice-2774.rs:17:1`
	`2`	`+ --> $DIR/ice-2774.rs:15:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn add_barfoos_to_foos<'a>(bars: &HashSet<&'a Bar>) {`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
`2`		`- --> $DIR/needless_lifetimes_impl_trait.rs:17:5`
	`2`	`+ --> $DIR/needless_lifetimes_impl_trait.rs:15:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn baz<'a>(&'a self) -> impl Foo + 'a {`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`note: the lint level is defined here`
`8`		`- --> $DIR/needless_lifetimes_impl_trait.rs:3:9`
	`8`	`+ --> $DIR/needless_lifetimes_impl_trait.rs:1:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::needless_lifetimes)]`
`11`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^`