diff --git a/compiler/rustc_hir_analysis/src/structured_errors/wrong_number_of_generic_args.rs b/compiler/rustc_hir_analysis/src/structured_errors/wrong_number_of_generic_args.rs index 758c44873fcad..21e96c78cb3af 100644 --- a/compiler/rustc_hir_analysis/src/structured_errors/wrong_number_of_generic_args.rs +++ b/compiler/rustc_hir_analysis/src/structured_errors/wrong_number_of_generic_args.rs @@ -942,17 +942,20 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> { } } - let span_lo_redundant_lt_args = lt_arg_spans[self.num_expected_lifetime_args()]; + let span_lo_redundant_lt_args = if self.num_expected_lifetime_args() == 0 { + lt_arg_spans[0] + } else { + lt_arg_spans[self.num_expected_lifetime_args() - 1] + }; let span_hi_redundant_lt_args = lt_arg_spans[lt_arg_spans.len() - 1]; - let span_redundant_lt_args = span_lo_redundant_lt_args.to(span_hi_redundant_lt_args); + let span_redundant_lt_args = + span_lo_redundant_lt_args.shrink_to_hi().to(span_hi_redundant_lt_args); debug!("span_redundant_lt_args: {:?}", span_redundant_lt_args); let num_redundant_lt_args = lt_arg_spans.len() - self.num_expected_lifetime_args(); - let msg_lifetimes = format!( - "remove the lifetime argument{s}", - s = pluralize!(num_redundant_lt_args), - ); + let msg_lifetimes = + format!("remove the lifetime argument{s}", s = pluralize!(num_redundant_lt_args)); err.span_suggestion_verbose( span_redundant_lt_args, @@ -981,11 +984,16 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> { } let span_lo_redundant_type_or_const_args = - gen_arg_spans[self.num_expected_type_or_const_args()]; + if self.num_expected_type_or_const_args() == 0 { + gen_arg_spans[0] + } else { + gen_arg_spans[self.num_expected_type_or_const_args() - 1] + }; let span_hi_redundant_type_or_const_args = gen_arg_spans[gen_arg_spans.len() - 1]; + let span_redundant_type_or_const_args = span_lo_redundant_type_or_const_args + .shrink_to_hi() + .to(span_hi_redundant_type_or_const_args); - let span_redundant_type_or_const_args = - span_lo_redundant_type_or_const_args.to(span_hi_redundant_type_or_const_args); debug!("span_redundant_type_or_const_args: {:?}", span_redundant_type_or_const_args); let num_redundant_gen_args = diff --git a/tests/rustdoc-ui/mismatched_arg_count.stderr b/tests/rustdoc-ui/mismatched_arg_count.stderr index 8e7def04f527d..9a698d8f5ad63 100644 --- a/tests/rustdoc-ui/mismatched_arg_count.stderr +++ b/tests/rustdoc-ui/mismatched_arg_count.stderr @@ -12,7 +12,7 @@ LL | type Alias<'a, T> = >::Assoc; help: remove the lifetime argument | LL - fn bar<'a, T: Trait<'a>>(_: Alias<'a, 'a, T>) {} -LL + fn bar<'a, T: Trait<'a>>(_: Alias<'a, , T>) {} +LL + fn bar<'a, T: Trait<'a>>(_: Alias<'a, T>) {} | error: aborting due to 1 previous error diff --git a/tests/ui/const-generics/adt_const_params/transmutable-ice-110969.stderr b/tests/ui/const-generics/adt_const_params/transmutable-ice-110969.stderr index 3f32b0eb6746d..ceac2c95bfae1 100644 --- a/tests/ui/const-generics/adt_const_params/transmutable-ice-110969.stderr +++ b/tests/ui/const-generics/adt_const_params/transmutable-ice-110969.stderr @@ -7,7 +7,7 @@ LL | Dst: BikeshedIntrinsicFrom, help: remove the unnecessary generic argument | LL - Dst: BikeshedIntrinsicFrom, -LL + Dst: BikeshedIntrinsicFrom, +LL + Dst: BikeshedIntrinsicFrom, | error[E0308]: mismatched types diff --git a/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr index d8e794a7a6523..61688f3acab66 100644 --- a/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr +++ b/tests/ui/const-generics/generic_arg_infer/infer-arg-test.stderr @@ -33,7 +33,7 @@ LL | struct All<'a, T, const N: usize> { help: remove the unnecessary generic argument | LL - let a: All<_, _, _>; -LL + let a: All<_, _, >; +LL + let a: All<_, _>; | error: aborting due to 4 previous errors diff --git a/tests/ui/const-generics/generic_const_exprs/const_kind_expr/issue_114151.stderr b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/issue_114151.stderr index a7232ef780e30..c66f351ea7f08 100644 --- a/tests/ui/const-generics/generic_const_exprs/const_kind_expr/issue_114151.stderr +++ b/tests/ui/const-generics/generic_const_exprs/const_kind_expr/issue_114151.stderr @@ -12,7 +12,7 @@ LL | fn foo( help: remove the unnecessary generic argument | LL - foo::<_, L>([(); L + 1 + L]); -LL + foo::<_, >([(); L + 1 + L]); +LL + foo::<_>([(); L + 1 + L]); | error[E0308]: mismatched types diff --git a/tests/ui/const-generics/incorrect-number-of-const-args.stderr b/tests/ui/const-generics/incorrect-number-of-const-args.stderr index 05c4a0a1a727c..f670ebc8ab0bb 100644 --- a/tests/ui/const-generics/incorrect-number-of-const-args.stderr +++ b/tests/ui/const-generics/incorrect-number-of-const-args.stderr @@ -30,7 +30,7 @@ LL | fn foo() -> usize { help: remove the unnecessary generic argument | LL - foo::<0, 0, 0>(); -LL + foo::<0, 0, >(); +LL + foo::<0, 0>(); | error: aborting due to 2 previous errors diff --git a/tests/ui/const-generics/invalid-constant-in-args.stderr b/tests/ui/const-generics/invalid-constant-in-args.stderr index 10334e0d896c7..c3a3f251d4677 100644 --- a/tests/ui/const-generics/invalid-constant-in-args.stderr +++ b/tests/ui/const-generics/invalid-constant-in-args.stderr @@ -7,7 +7,7 @@ LL | let _: Cell<&str, "a"> = Cell::new(""); help: remove the unnecessary generic argument | LL - let _: Cell<&str, "a"> = Cell::new(""); -LL + let _: Cell<&str, > = Cell::new(""); +LL + let _: Cell<&str> = Cell::new(""); | error: aborting due to 1 previous error diff --git a/tests/ui/constructor-lifetime-args.stderr b/tests/ui/constructor-lifetime-args.stderr index 37b13cd048fe9..980a812e3b4e5 100644 --- a/tests/ui/constructor-lifetime-args.stderr +++ b/tests/ui/constructor-lifetime-args.stderr @@ -30,7 +30,7 @@ LL | struct S<'a, 'b>(&'a u8, &'b u8); help: remove the lifetime argument | LL - S::<'static, 'static, 'static>(&0, &0); -LL + S::<'static, 'static, >(&0, &0); +LL + S::<'static, 'static>(&0, &0); | error[E0107]: enum takes 2 lifetime arguments but 1 lifetime argument was supplied @@ -65,7 +65,7 @@ LL | enum E<'a, 'b> { help: remove the lifetime argument | LL - E::V::<'static, 'static, 'static>(&0); -LL + E::V::<'static, 'static, >(&0); +LL + E::V::<'static, 'static>(&0); | error: aborting due to 4 previous errors diff --git a/tests/ui/error-codes/E0107.stderr b/tests/ui/error-codes/E0107.stderr index d8bd96e0ad466..3271abd8a79b2 100644 --- a/tests/ui/error-codes/E0107.stderr +++ b/tests/ui/error-codes/E0107.stderr @@ -47,7 +47,7 @@ LL | struct Foo<'a>(&'a str); help: remove the lifetime arguments | LL - foo2: Foo<'a, 'b, 'c>, -LL + foo2: Foo<'a, >, +LL + foo2: Foo<'a>, | error[E0107]: struct takes 1 lifetime argument but 2 lifetime arguments were supplied @@ -64,7 +64,7 @@ LL | struct Qux<'a, T>(&'a T); help: remove the lifetime argument | LL - qux1: Qux<'a, 'b, i32>, -LL + qux1: Qux<'a, , i32>, +LL + qux1: Qux<'a, i32>, | error[E0107]: struct takes 1 lifetime argument but 2 lifetime arguments were supplied @@ -81,7 +81,7 @@ LL | struct Qux<'a, T>(&'a T); help: remove the lifetime argument | LL - qux2: Qux<'a, i32, 'b>, -LL + qux2: Qux<'a, i32, >, +LL + qux2: Qux<'a>, | error[E0107]: struct takes 1 lifetime argument but 3 lifetime arguments were supplied @@ -98,7 +98,7 @@ LL | struct Qux<'a, T>(&'a T); help: remove the lifetime arguments | LL - qux3: Qux<'a, 'b, 'c, i32>, -LL + qux3: Qux<'a, , i32>, +LL + qux3: Qux<'a, i32>, | error[E0107]: struct takes 1 lifetime argument but 3 lifetime arguments were supplied @@ -115,7 +115,7 @@ LL | struct Qux<'a, T>(&'a T); help: remove the lifetime arguments | LL - qux4: Qux<'a, i32, 'b, 'c>, -LL + qux4: Qux<'a, i32, >, +LL + qux4: Qux<'a>, | error[E0107]: struct takes 1 lifetime argument but 3 lifetime arguments were supplied @@ -132,7 +132,7 @@ LL | struct Qux<'a, T>(&'a T); help: remove the lifetime argument | LL - qux5: Qux<'a, 'b, i32, 'c>, -LL + qux5: Qux<'a, , i32, 'c>, +LL + qux5: Qux<'a, i32, 'c>, | error[E0107]: struct takes 0 lifetime arguments but 2 lifetime arguments were supplied diff --git a/tests/ui/generic-associated-types/parameter_number_and_kind.stderr b/tests/ui/generic-associated-types/parameter_number_and_kind.stderr index 7b7f21b00c5ad..1c9351cb351ae 100644 --- a/tests/ui/generic-associated-types/parameter_number_and_kind.stderr +++ b/tests/ui/generic-associated-types/parameter_number_and_kind.stderr @@ -12,7 +12,7 @@ LL | type E<'a, T>; help: remove the lifetime argument | LL - type FErr1 = Self::E<'static, 'static>; -LL + type FErr1 = Self::E<'static, >; +LL + type FErr1 = Self::E<'static>; | error[E0107]: associated type takes 1 generic argument but 0 generic arguments were supplied @@ -45,7 +45,7 @@ LL | type E<'a, T>; help: remove the unnecessary generic argument | LL - type FErr2 = Self::E<'static, T, u32>; -LL + type FErr2 = Self::E<'static, T, >; +LL + type FErr2 = Self::E<'static, T>; | error: aborting due to 3 previous errors diff --git a/tests/ui/generics/bad-mid-path-type-params.stderr b/tests/ui/generics/bad-mid-path-type-params.stderr index ba1d48f1210b2..cff5464dce49b 100644 --- a/tests/ui/generics/bad-mid-path-type-params.stderr +++ b/tests/ui/generics/bad-mid-path-type-params.stderr @@ -12,7 +12,7 @@ LL | fn new(x: T, _: U) -> S { help: remove the unnecessary generic argument | LL - let _ = S::new::(1, 1.0); -LL + let _ = S::new::(1, 1.0); +LL + let _ = S::new::(1, 1.0); | error[E0107]: struct takes 0 lifetime arguments but 1 lifetime argument was supplied @@ -46,7 +46,7 @@ LL | fn new(x: T, y: U) -> Self; help: remove the unnecessary generic argument | LL - let _: S2 = Trait::new::(1, 1.0); -LL + let _: S2 = Trait::new::(1, 1.0); +LL + let _: S2 = Trait::new::(1, 1.0); | error[E0107]: trait takes 0 lifetime arguments but 1 lifetime argument was supplied @@ -80,7 +80,7 @@ LL | fn new(x: T, y: U) -> Self; help: remove the unnecessary generic argument | LL - let _: S2 = Trait::<'a,isize>::new::(1, 1.0); -LL + let _: S2 = Trait::<'a,isize>::new::(1, 1.0); +LL + let _: S2 = Trait::<'a,isize>::new::(1, 1.0); | error: aborting due to 5 previous errors diff --git a/tests/ui/generics/foreign-generic-mismatch.stderr b/tests/ui/generics/foreign-generic-mismatch.stderr index 740963aeec548..4cf76cde9203f 100644 --- a/tests/ui/generics/foreign-generic-mismatch.stderr +++ b/tests/ui/generics/foreign-generic-mismatch.stderr @@ -30,7 +30,7 @@ LL | pub fn lt_arg<'a: 'a>() {} help: remove the lifetime argument | LL - foreign_generic_mismatch::lt_arg::<'static, 'static>(); -LL + foreign_generic_mismatch::lt_arg::<'static, >(); +LL + foreign_generic_mismatch::lt_arg::<'static>(); | error: aborting due to 2 previous errors diff --git a/tests/ui/generics/generic-arg-mismatch-recover.stderr b/tests/ui/generics/generic-arg-mismatch-recover.stderr index e8c2a4665f3da..d2953e37c8ccd 100644 --- a/tests/ui/generics/generic-arg-mismatch-recover.stderr +++ b/tests/ui/generics/generic-arg-mismatch-recover.stderr @@ -12,7 +12,7 @@ LL | struct Foo<'a, T: 'a>(&'a T); help: remove the lifetime argument | LL - Foo::<'static, 'static, ()>(&0); -LL + Foo::<'static, , ()>(&0); +LL + Foo::<'static, ()>(&0); | error[E0107]: struct takes 1 lifetime argument but 2 lifetime arguments were supplied @@ -29,7 +29,7 @@ LL | struct Bar<'a>(&'a ()); help: remove the lifetime argument | LL - Bar::<'static, 'static, ()>(&()); -LL + Bar::<'static, , ()>(&()); +LL + Bar::<'static, ()>(&()); | error[E0107]: struct takes 0 generic arguments but 1 generic argument was supplied diff --git a/tests/ui/generics/generic-impl-more-params-with-defaults.stderr b/tests/ui/generics/generic-impl-more-params-with-defaults.stderr index b0973c477ff4c..a180e348a686b 100644 --- a/tests/ui/generics/generic-impl-more-params-with-defaults.stderr +++ b/tests/ui/generics/generic-impl-more-params-with-defaults.stderr @@ -12,7 +12,7 @@ LL | struct Vec( help: remove the unnecessary generic argument | LL - Vec::::new(); -LL + Vec::::new(); +LL + Vec::::new(); | error: aborting due to 1 previous error diff --git a/tests/ui/generics/generic-type-more-params-with-defaults.stderr b/tests/ui/generics/generic-type-more-params-with-defaults.stderr index e83a433b0605d..9b73b7375d795 100644 --- a/tests/ui/generics/generic-type-more-params-with-defaults.stderr +++ b/tests/ui/generics/generic-type-more-params-with-defaults.stderr @@ -12,7 +12,7 @@ LL | struct Vec( help: remove the unnecessary generic argument | LL - let _: Vec; -LL + let _: Vec; +LL + let _: Vec; | error: aborting due to 1 previous error diff --git a/tests/ui/generics/wrong-number-of-args.stderr b/tests/ui/generics/wrong-number-of-args.stderr index 1363032ad142f..17503b86e19cd 100644 --- a/tests/ui/generics/wrong-number-of-args.stderr +++ b/tests/ui/generics/wrong-number-of-args.stderr @@ -249,7 +249,7 @@ LL | struct Ty; help: remove the unnecessary generic arguments | LL - type D = Ty<'static, usize, { 0 }>; -LL + type D = Ty<'static, >; +LL + type D = Ty<'static, usize>; | error[E0107]: missing generics for struct `type_and_type::Ty` @@ -300,7 +300,7 @@ LL | struct Ty(A, B); help: remove the unnecessary generic argument | LL - type D = Ty; -LL + type D = Ty; +LL + type D = Ty; | error[E0107]: struct takes 2 generic arguments but 0 generic arguments were supplied @@ -381,7 +381,7 @@ LL | struct Ty<'a, T>(&'a T); help: remove the lifetime argument | LL - type F = Ty<'static, usize, 'static, usize>; -LL + type F = Ty<'static, usize, , usize>; +LL + type F = Ty<'static, usize>; | error[E0107]: struct takes 1 generic argument but 2 generic arguments were supplied @@ -398,7 +398,7 @@ LL | struct Ty<'a, T>(&'a T); help: remove the unnecessary generic argument | LL - type F = Ty<'static, usize, 'static, usize>; -LL + type F = Ty<'static, usize, 'static, >; +LL + type F = Ty<'static, usize>; | error[E0107]: missing generics for struct `type_and_type_and_type::Ty` @@ -449,7 +449,7 @@ LL | struct Ty(A, B, C); help: remove the unnecessary generic argument | LL - type E = Ty; -LL + type E = Ty; +LL + type E = Ty; | error[E0107]: struct takes at least 2 generic arguments but 0 generic arguments were supplied @@ -499,7 +499,7 @@ LL | trait GenericLifetime<'a> { help: remove the lifetime argument | LL - type C = Box>; -LL + type C = Box>; +LL + type C = Box>; | error[E0107]: missing generics for trait `GenericType` @@ -532,7 +532,7 @@ LL | trait GenericType { help: remove the unnecessary generic argument | LL - type E = Box>; -LL + type E = Box>; +LL + type E = Box>; | error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied @@ -582,7 +582,7 @@ LL | trait GenericLifetimeAT<'a> { help: remove the lifetime argument | LL - type B = Box>; -LL + type B = Box>; +LL + type B = Box>; | error[E0107]: trait takes 0 generic arguments but 1 generic argument was supplied @@ -632,7 +632,7 @@ LL | trait GenericTypeAT { help: remove the unnecessary generic argument | LL - type B = Box>; -LL + type B = Box>; +LL + type B = Box>; | error[E0107]: trait takes 0 lifetime arguments but 1 lifetime argument was supplied @@ -714,7 +714,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the lifetime argument | LL - type C = Box>; -LL + type C = Box>; +LL + type C = Box>; | error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied @@ -747,7 +747,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the unnecessary generic argument | LL - type E = Box>; -LL + type E = Box>; +LL + type E = Box>; | error[E0107]: trait takes 1 lifetime argument but 2 lifetime arguments were supplied @@ -764,7 +764,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the lifetime argument | LL - type F = Box>; -LL + type F = Box>; +LL + type F = Box>; | error[E0107]: trait takes 1 generic argument but 2 generic arguments were supplied @@ -781,7 +781,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the unnecessary generic argument | LL - type G = Box>; -LL + type G = Box>; +LL + type G = Box>; | error[E0107]: trait takes 1 lifetime argument but 2 lifetime arguments were supplied @@ -798,7 +798,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the lifetime argument | LL - type H = Box>; -LL + type H = Box>; +LL + type H = Box>; | error[E0107]: trait takes 1 generic argument but 2 generic arguments were supplied @@ -815,7 +815,7 @@ LL | trait GenericLifetimeTypeAT<'a, A> { help: remove the unnecessary generic argument | LL - type H = Box>; -LL + type H = Box>; +LL + type H = Box>; | error[E0107]: trait takes 2 generic arguments but 0 generic arguments were supplied @@ -866,7 +866,7 @@ LL | trait GenericTypeTypeAT { help: remove the unnecessary generic argument | LL - type C = Box>; -LL + type C = Box>; +LL + type C = Box>; | error[E0107]: trait takes 2 lifetime arguments but 1 lifetime argument was supplied @@ -1011,7 +1011,7 @@ LL | type D = HashMap; help: remove the unnecessary generic argument | LL - type D = HashMap; -LL + type D = HashMap; +LL + type D = HashMap; | error[E0107]: struct takes at least 2 generic arguments but 0 generic arguments were supplied @@ -1081,7 +1081,7 @@ LL | type D = Result; help: remove the unnecessary generic argument | LL - type D = Result; -LL + type D = Result; +LL + type D = Result; | error[E0107]: enum takes 2 generic arguments but 0 generic arguments were supplied diff --git a/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr index 1c22e77e8171b..e225d7076b8cf 100644 --- a/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr +++ b/tests/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr @@ -13,7 +13,7 @@ LL | fn foo(_f: impl AsRef) {} help: remove the unnecessary generic argument | LL - foo::("".to_string()); -LL + foo::("".to_string()); +LL + foo::("".to_string()); | error: aborting due to 1 previous error diff --git a/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr b/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr index 02dbfca15a4a2..c0a5b62a56a2b 100644 --- a/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr +++ b/tests/ui/late-bound-lifetimes/mismatched_arg_count.stderr @@ -12,7 +12,7 @@ LL | type Alias<'a, T> = >::Assoc; help: remove the lifetime argument | LL - fn bar<'a, T: Trait<'a>>(_: Alias<'a, 'a, T>) {} -LL + fn bar<'a, T: Trait<'a>>(_: Alias<'a, , T>) {} +LL + fn bar<'a, T: Trait<'a>>(_: Alias<'a, T>) {} | error: aborting due to 1 previous error diff --git a/tests/ui/lifetimes/noisy-follow-up-erro.stderr b/tests/ui/lifetimes/noisy-follow-up-erro.stderr index 90dfc88e19f0d..3c2d0df683a94 100644 --- a/tests/ui/lifetimes/noisy-follow-up-erro.stderr +++ b/tests/ui/lifetimes/noisy-follow-up-erro.stderr @@ -12,7 +12,7 @@ LL | struct Foo<'c, 'd>(&'c (), &'d ()); help: remove the lifetime argument | LL - fn boom(&self, foo: &mut Foo<'_, '_, 'a>) -> Result<(), &'a ()> { -LL + fn boom(&self, foo: &mut Foo<'_, '_, >) -> Result<(), &'a ()> { +LL + fn boom(&self, foo: &mut Foo<'_, '_>) -> Result<(), &'a ()> { | error[E0621]: explicit lifetime required in the type of `foo` diff --git a/tests/ui/methods/method-call-lifetime-args-fail.stderr b/tests/ui/methods/method-call-lifetime-args-fail.stderr index 60ef1060aaca5..2eda01fa20c38 100644 --- a/tests/ui/methods/method-call-lifetime-args-fail.stderr +++ b/tests/ui/methods/method-call-lifetime-args-fail.stderr @@ -30,7 +30,7 @@ LL | fn early<'a, 'b>(self) -> (&'a u8, &'b u8) { loop {} } help: remove the lifetime argument | LL - S.early::<'static, 'static, 'static>(); -LL + S.early::<'static, 'static, >(); +LL + S.early::<'static, 'static>(); | error[E0794]: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present @@ -233,7 +233,7 @@ LL | fn early<'a, 'b>(self) -> (&'a u8, &'b u8) { loop {} } help: remove the lifetime argument | LL - S::early::<'static, 'static, 'static>(S); -LL + S::early::<'static, 'static, >(S); +LL + S::early::<'static, 'static>(S); | error: aborting due to 18 previous errors diff --git a/tests/ui/traits/associated_type_bound/116464-invalid-assoc-type-suggestion-in-trait-impl.stderr b/tests/ui/traits/associated_type_bound/116464-invalid-assoc-type-suggestion-in-trait-impl.stderr index 5a54ca181ce63..d25192b3d6d86 100644 --- a/tests/ui/traits/associated_type_bound/116464-invalid-assoc-type-suggestion-in-trait-impl.stderr +++ b/tests/ui/traits/associated_type_bound/116464-invalid-assoc-type-suggestion-in-trait-impl.stderr @@ -127,7 +127,7 @@ LL | struct Struct> { help: remove the unnecessary generic argument | LL - impl, U> YetAnotherTrait for Struct {} -LL + impl, U> YetAnotherTrait for Struct {} +LL + impl, U> YetAnotherTrait for Struct {} | error: aborting due to 9 previous errors diff --git a/tests/ui/traits/object/vs-lifetime.stderr b/tests/ui/traits/object/vs-lifetime.stderr index e02c750055bc8..889e1e82876aa 100644 --- a/tests/ui/traits/object/vs-lifetime.stderr +++ b/tests/ui/traits/object/vs-lifetime.stderr @@ -18,7 +18,7 @@ LL | struct S<'a, T>(&'a u8, T); help: remove the lifetime argument | LL - let _: S<'static, 'static>; -LL + let _: S<'static, >; +LL + let _: S<'static>; | error[E0107]: struct takes 1 generic argument but 0 generic arguments were supplied diff --git a/tests/ui/traits/test-2.stderr b/tests/ui/traits/test-2.stderr index d1a003aa3f422..d64497309ef93 100644 --- a/tests/ui/traits/test-2.stderr +++ b/tests/ui/traits/test-2.stderr @@ -29,7 +29,7 @@ LL | trait bar { fn dup(&self) -> Self; fn blah(&self); } help: remove the unnecessary generic argument | LL - 10.blah::(); -LL + 10.blah::(); +LL + 10.blah::(); | error[E0038]: the trait `bar` cannot be made into an object diff --git a/tests/ui/transmutability/issue-101739-2.stderr b/tests/ui/transmutability/issue-101739-2.stderr index ebaeb4dabdaf8..f7d9f65d706a7 100644 --- a/tests/ui/transmutability/issue-101739-2.stderr +++ b/tests/ui/transmutability/issue-101739-2.stderr @@ -6,10 +6,11 @@ LL | Dst: BikeshedIntrinsicFrom< | help: remove the unnecessary generic arguments | +LL - ASSUME_ALIGNMENT, LL - ASSUME_LIFETIMES, LL - ASSUME_VALIDITY, LL - ASSUME_VISIBILITY, -LL + , +LL + ASSUME_ALIGNMENT, | error[E0308]: mismatched types diff --git a/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr index 83679f4b1f6bd..116dd18664591 100644 --- a/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr +++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_1.stderr @@ -12,7 +12,7 @@ LL | struct Foo<'a, T:'a> { help: remove the unnecessary generic argument | LL - let c: Foo<_, _> = Foo { r: &5 }; -LL + let c: Foo<_, > = Foo { r: &5 }; +LL + let c: Foo<_> = Foo { r: &5 }; | error: aborting due to 1 previous error diff --git a/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr index 8d519600edcd9..d2734f4acc892 100644 --- a/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr +++ b/tests/ui/typeck/typeck_type_placeholder_lifetime_2.stderr @@ -12,7 +12,7 @@ LL | struct Foo<'a, T:'a> { help: remove the unnecessary generic argument | LL - let c: Foo<_, usize> = Foo { r: &5 }; -LL + let c: Foo<_, > = Foo { r: &5 }; +LL + let c: Foo<_> = Foo { r: &5 }; | error: aborting due to 1 previous error