Revert "Fix list length"

Dylan-DPC · Dylan-DPC · commit 746c9b443bb2 · 2022-04-05T23:23:41.000+02:00
This reverts commit e2bba07.
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
@@ -1819,7 +1819,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {
         }
 
         let len = impl_candidates.len();
-        let end = if impl_candidates.len() <= 9 { impl_candidates.len() } else { 8 };
+        let end = if impl_candidates.len() <= 5 { impl_candidates.len() } else { 4 };
 
         let normalize = |candidate| {
             self.tcx.infer_ctxt().enter(|ref infcx| {
diff --git a/src/test/ui/binop/binop-mul-i32-f32.stderr b/src/test/ui/binop/binop-mul-i32-f32.stderr
@@ -10,10 +10,6 @@ LL |     x * y
              <&i32 as Mul<&i32>>
              <i32 as Mul<&i32>>
              <i32 as Mul>
-             <&'a f32 as Mul<f32>>
-             <&'a f64 as Mul<f64>>
-             <&'a i128 as Mul<i128>>
-             <&'a i16 as Mul<i16>>
            and 49 others
 
 error: aborting due to previous error
diff --git a/src/test/ui/binop/issue-77910-1.stderr b/src/test/ui/binop/issue-77910-1.stderr
@@ -21,10 +21,6 @@ LL |     assert_eq!(foo, y);
              <extern "C" fn(A) -> Ret as Debug>
              <extern "C" fn(A, ...) -> Ret as Debug>
              <extern "C" fn(A, B) -> Ret as Debug>
-             <extern "C" fn(A, B, ...) -> Ret as Debug>
-             <extern "C" fn(A, B, C) -> Ret as Debug>
-             <extern "C" fn(A, B, C, ...) -> Ret as Debug>
-             <extern "C" fn(A, B, C, D) -> Ret as Debug>
            and 68 others
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/binop/shift-various-bad-types.stderr b/src/test/ui/binop/shift-various-bad-types.stderr
@@ -10,10 +10,6 @@ LL |     22 >> p.char;
              <&'a i128 as Shr<i16>>
              <&'a i128 as Shr<i32>>
              <&'a i128 as Shr<i64>>
-             <&'a i128 as Shr<i8>>
-             <&'a i128 as Shr<isize>>
-             <&'a i128 as Shr<u128>>
-             <&'a i128 as Shr<u16>>
            and 568 others
 
 error[E0277]: no implementation for `{integer} >> &str`
@@ -28,10 +24,6 @@ LL |     22 >> p.str;
              <&'a i128 as Shr<i16>>
              <&'a i128 as Shr<i32>>
              <&'a i128 as Shr<i64>>
-             <&'a i128 as Shr<i8>>
-             <&'a i128 as Shr<isize>>
-             <&'a i128 as Shr<u128>>
-             <&'a i128 as Shr<u16>>
            and 568 others
 
 error[E0277]: no implementation for `{integer} >> &Panolpy`
@@ -46,10 +38,6 @@ LL |     22 >> p;
              <&'a i128 as Shr<i16>>
              <&'a i128 as Shr<i32>>
              <&'a i128 as Shr<i64>>
-             <&'a i128 as Shr<i8>>
-             <&'a i128 as Shr<isize>>
-             <&'a i128 as Shr<u128>>
-             <&'a i128 as Shr<u16>>
            and 568 others
 
 error[E0308]: mismatched types
diff --git a/src/test/ui/const-generics/exhaustive-value.stderr b/src/test/ui/const-generics/exhaustive-value.stderr
@@ -9,10 +9,6 @@ LL |     <() as Foo<N>>::test()
              <() as Foo<100_u8>>
              <() as Foo<101_u8>>
              <() as Foo<102_u8>>
-             <() as Foo<103_u8>>
-             <() as Foo<104_u8>>
-             <() as Foo<105_u8>>
-             <() as Foo<106_u8>>
            and 248 others
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr
@@ -16,10 +16,6 @@ LL |     = [0; (i8::MAX + 1u8) as usize];
              <&i8 as Add<&i8>>
              <i8 as Add<&i8>>
              <i8 as Add>
-             <&'a f32 as Add<f32>>
-             <&'a f64 as Add<f64>>
-             <&'a i128 as Add<i128>>
-             <&'a i16 as Add<i16>>
            and 48 others
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr
@@ -16,10 +16,6 @@ LL |     : [u32; (i8::MAX as i8 + 1u8) as usize]
              <&i8 as Add<&i8>>
              <i8 as Add<&i8>>
              <i8 as Add>
-             <&'a f32 as Add<f32>>
-             <&'a f64 as Add<f64>>
-             <&'a i128 as Add<i128>>
-             <&'a i16 as Add<i16>>
            and 48 others
 
 error[E0604]: only `u8` can be cast as `char`, not `i8`
diff --git a/src/test/ui/consts/too_generic_eval_ice.stderr b/src/test/ui/consts/too_generic_eval_ice.stderr
@@ -26,10 +26,6 @@ LL |         [5; Self::HOST_SIZE] == [6; 0]
              <&[T] as PartialEq<Vec<U, A>>>
              <&mut [B] as PartialEq<[A; N]>>
              <&mut [T] as PartialEq<Vec<U, A>>>
-             <[A; N] as PartialEq<&[B]>>
-             <[A; N] as PartialEq<&mut [B]>>
-             <[A; N] as PartialEq<[B; N]>>
-             <[A; N] as PartialEq<[B]>>
            and 3 others
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr
@@ -9,8 +9,6 @@ LL |     f1.foo(1usize);
              <Bar as Foo<i32>>
              <Bar as Foo<i8>>
              <Bar as Foo<u16>>
-             <Bar as Foo<u32>>
-             <Bar as Foo<u8>>
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr
@@ -11,11 +11,6 @@ LL |     Foo::<i32>::bar(&1i8);
              <i8 as Foo<u16>>
              <i8 as Foo<u32>>
              <i8 as Foo<u64>>
-             <i8 as Foo<u8>>
-             <u8 as Foo<bool>>
-             <u8 as Foo<u16>>
-             <u8 as Foo<u32>>
-             <u8 as Foo<u64>>
 
 error[E0277]: the trait bound `u8: Foo<i32>` is not satisfied
   --> $DIR/issue-39802-show-5-trait-impls.rs:25:21
@@ -30,11 +25,6 @@ LL |     Foo::<i32>::bar(&1u8);
              <u8 as Foo<u16>>
              <u8 as Foo<u32>>
              <u8 as Foo<u64>>
-             <i8 as Foo<bool>>
-             <i8 as Foo<u16>>
-             <i8 as Foo<u32>>
-             <i8 as Foo<u64>>
-             <i8 as Foo<u8>>
 
 error[E0277]: the trait bound `bool: Foo<i32>` is not satisfied
   --> $DIR/issue-39802-show-5-trait-impls.rs:26:21
@@ -49,8 +39,6 @@ LL |     Foo::<i32>::bar(&true);
              <bool as Foo<i8>>
              <bool as Foo<u16>>
              <bool as Foo<u32>>
-             <bool as Foo<u64>>
-             <bool as Foo<u8>>
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr b/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr
@@ -27,10 +27,6 @@ LL | const UNIVERSAL_GRAVITATIONAL_CONSTANT: f64 = 6.674e−11; // m³⋅kg⁻¹
              <&'a f64 as Sub<f64>>
              <&'a i128 as Sub<i128>>
              <&'a i16 as Sub<i16>>
-             <&'a i32 as Sub<i32>>
-             <&'a i64 as Sub<i64>>
-             <&'a i8 as Sub<i8>>
-             <&'a isize as Sub<isize>>
            and 48 others
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/impl-trait/equality.stderr b/src/test/ui/impl-trait/equality.stderr
@@ -29,10 +29,6 @@ LL |         n + sum_to(n - 1)
              <&u32 as Add<&u32>>
              <u32 as Add<&u32>>
              <u32 as Add>
-             <&'a f32 as Add<f32>>
-             <&'a f64 as Add<f64>>
-             <&'a i128 as Add<i128>>
-             <&'a i16 as Add<i16>>
            and 48 others
 
 error: aborting due to 2 previous errors; 1 warning emitted
diff --git a/src/test/ui/issues/issue-11771.stderr b/src/test/ui/issues/issue-11771.stderr
@@ -10,10 +10,6 @@ LL |     1 +
              <&'a f64 as Add<f64>>
              <&'a i128 as Add<i128>>
              <&'a i16 as Add<i16>>
-             <&'a i32 as Add<i32>>
-             <&'a i64 as Add<i64>>
-             <&'a i8 as Add<i8>>
-             <&'a isize as Add<isize>>
            and 48 others
 
 error[E0277]: cannot add `()` to `{integer}`
@@ -28,10 +24,6 @@ LL |     1 +
              <&'a f64 as Add<f64>>
              <&'a i128 as Add<i128>>
              <&'a i16 as Add<i16>>
-             <&'a i32 as Add<i32>>
-             <&'a i64 as Add<i64>>
-             <&'a i8 as Add<i8>>
-             <&'a isize as Add<isize>>
            and 48 others
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-24352.stderr b/src/test/ui/issues/issue-24352.stderr
@@ -10,10 +10,6 @@ LL |     1.0f64 - 1
              <&f64 as Sub<&f64>>
              <f64 as Sub<&f64>>
              <f64 as Sub>
-             <&'a f32 as Sub<f32>>
-             <&'a i128 as Sub<i128>>
-             <&'a i16 as Sub<i16>>
-             <&'a i32 as Sub<i32>>
            and 48 others
 help: consider using a floating-point literal by writing it with `.0`
    |
diff --git a/src/test/ui/issues/issue-50582.stderr b/src/test/ui/issues/issue-50582.stderr
@@ -19,10 +19,6 @@ LL |     Vec::<[(); 1 + for x in 0..1 {}]>::new();
              <&'a f64 as Add<f64>>
              <&'a i128 as Add<i128>>
              <&'a i16 as Add<i16>>
-             <&'a i32 as Add<i32>>
-             <&'a i64 as Add<i64>>
-             <&'a i8 as Add<i8>>
-             <&'a isize as Add<isize>>
            and 48 others
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-59488.stderr b/src/test/ui/issues/issue-59488.stderr
@@ -99,10 +99,6 @@ LL |     assert_eq!(Foo::Bar, i);
              <extern "C" fn(A) -> Ret as Debug>
              <extern "C" fn(A, ...) -> Ret as Debug>
              <extern "C" fn(A, B) -> Ret as Debug>
-             <extern "C" fn(A, B, ...) -> Ret as Debug>
-             <extern "C" fn(A, B, C) -> Ret as Debug>
-             <extern "C" fn(A, B, C, ...) -> Ret as Debug>
-             <extern "C" fn(A, B, C, D) -> Ret as Debug>
            and 68 others
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/kindck/kindck-copy.stderr b/src/test/ui/kindck/kindck-copy.stderr
@@ -9,10 +9,6 @@ LL |     assert_copy::<&'static mut isize>();
              <f32 as Copy>
              <f64 as Copy>
              <i128 as Copy>
-             <i16 as Copy>
-             <i32 as Copy>
-             <i64 as Copy>
-             <i8 as Copy>
            and 6 others
 note: required by a bound in `assert_copy`
   --> $DIR/kindck-copy.rs:5:18
@@ -31,10 +27,6 @@ LL |     assert_copy::<&'a mut isize>();
              <f32 as Copy>
              <f64 as Copy>
              <i128 as Copy>
-             <i16 as Copy>
-             <i32 as Copy>
-             <i64 as Copy>
-             <i8 as Copy>
            and 6 others
 note: required by a bound in `assert_copy`
   --> $DIR/kindck-copy.rs:5:18
diff --git a/src/test/ui/lexer/lex-bad-char-literals-6.stderr b/src/test/ui/lexer/lex-bad-char-literals-6.stderr
@@ -43,10 +43,6 @@ LL |     if x == y {}
              <&'a str as PartialEq<String>>
              <&'b str as PartialEq<Cow<'a, str>>>
              <str as PartialEq<Cow<'a, str>>>
-             <str as PartialEq<OsStr>>
-             <str as PartialEq<OsString>>
-             <str as PartialEq<String>>
-             <str as PartialEq>
            and 4 others
 
 error[E0308]: mismatched types
@@ -69,10 +65,6 @@ LL |     if x == z {}
              <&'a str as PartialEq<String>>
              <&'b str as PartialEq<Cow<'a, str>>>
              <str as PartialEq<Cow<'a, str>>>
-             <str as PartialEq<OsStr>>
-             <str as PartialEq<OsString>>
-             <str as PartialEq<String>>
-             <str as PartialEq>
            and 4 others
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/mismatched_types/binops.stderr b/src/test/ui/mismatched_types/binops.stderr
@@ -10,10 +10,6 @@ LL |     1 + Some(1);
              <&'a f64 as Add<f64>>
              <&'a i128 as Add<i128>>
              <&'a i16 as Add<i16>>
-             <&'a i32 as Add<i32>>
-             <&'a i64 as Add<i64>>
-             <&'a i8 as Add<i8>>
-             <&'a isize as Add<isize>>
            and 48 others
 
 error[E0277]: cannot subtract `Option<{integer}>` from `usize`
@@ -28,10 +24,6 @@ LL |     2 as usize - Some(1);
              <&usize as Sub<&usize>>
              <usize as Sub<&usize>>
              <usize as Sub>
-             <&'a f32 as Sub<f32>>
-             <&'a f64 as Sub<f64>>
-             <&'a i128 as Sub<i128>>
-             <&'a i16 as Sub<i16>>
            and 48 others
 
 error[E0277]: cannot multiply `{integer}` by `()`
@@ -46,10 +38,6 @@ LL |     3 * ();
              <&'a f64 as Mul<f64>>
              <&'a i128 as Mul<i128>>
              <&'a i16 as Mul<i16>>
-             <&'a i32 as Mul<i32>>
-             <&'a i64 as Mul<i64>>
-             <&'a i8 as Mul<i8>>
-             <&'a isize as Mul<isize>>
            and 49 others
 
 error[E0277]: cannot divide `{integer}` by `&str`
@@ -64,10 +52,6 @@ LL |     4 / "";
              <&'a f64 as Div<f64>>
              <&'a i128 as Div<i128>>
              <&'a i16 as Div<i16>>
-             <&'a i32 as Div<i32>>
-             <&'a i64 as Div<i64>>
-             <&'a i8 as Div<i8>>
-             <&'a isize as Div<isize>>
            and 54 others
 
 error[E0277]: can't compare `{integer}` with `String`
@@ -82,10 +66,6 @@ LL |     5 < String::new();
              <f64 as PartialOrd>
              <i128 as PartialOrd>
              <i16 as PartialOrd>
-             <i32 as PartialOrd>
-             <i64 as PartialOrd>
-             <i8 as PartialOrd>
-             <isize as PartialOrd>
            and 6 others
 
 error[E0277]: can't compare `{integer}` with `Result<{integer}, _>`
@@ -100,10 +80,6 @@ LL |     6 == Ok(1);
              <f64 as PartialEq>
              <i128 as PartialEq>
              <i16 as PartialEq>
-             <i32 as PartialEq>
-             <i64 as PartialEq>
-             <i8 as PartialEq>
-             <isize as PartialEq>
            and 6 others
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/never_type/issue-13352.stderr b/src/test/ui/never_type/issue-13352.stderr
@@ -10,10 +10,6 @@ LL |     2_usize + (loop {});
              <&usize as Add<&usize>>
              <usize as Add<&usize>>
              <usize as Add>
-             <&'a f32 as Add<f32>>
-             <&'a f64 as Add<f64>>
-             <&'a i128 as Add<i128>>
-             <&'a i16 as Add<i16>>
            and 48 others
 
 error: aborting due to previous error
diff --git a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.stderr b/src/test/ui/numbers-arithmetic/not-suggest-float-literal.stderr
diff --git a/src/test/ui/numbers-arithmetic/suggest-float-literal.stderr b/src/test/ui/numbers-arithmetic/suggest-float-literal.stderr
diff --git a/src/test/ui/span/multiline-span-simple.stderr b/src/test/ui/span/multiline-span-simple.stderr
diff --git a/src/test/ui/suggestions/into-str.stderr b/src/test/ui/suggestions/into-str.stderr
diff --git a/src/test/ui/try-trait/bad-interconversion.stderr b/src/test/ui/try-trait/bad-interconversion.stderr
diff --git a/src/test/ui/type/type-check-defaults.stderr b/src/test/ui/type/type-check-defaults.stderr
diff --git a/src/test/ui/typeck/issue-81293.stderr b/src/test/ui/typeck/issue-81293.stderr
diff --git a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr

Original file line number	Diff line number	Diff line change
`@@ -1819,7 +1819,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> {`
`1819`	`1819`	`}`
`1820`	`1820`
`1821`	`1821`	`let len = impl_candidates.len();`
`1822`		`- let end = if impl_candidates.len() <= 9 { impl_candidates.len() } else { 8 };`
	`1822`	`+ let end = if impl_candidates.len() <= 5 { impl_candidates.len() } else { 4 };`
`1823`	`1823`
`1824`	`1824`	`let normalize = \|candidate\| {`
`1825`	`1825`	`self.tcx.infer_ctxt().enter(\|ref infcx\| {`