Updated UI test output

rodrimati1992 · Jan 6, 2024 · e703910 · e703910
1 parent 8b4ad95
commit e703910
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 40 deletions.
diff --git a/tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.stderr b/tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.stderr
@@ -9,21 +9,25 @@ warning: unused import: `core::fmt::Debug`
 error[E0309]: the parameter type `V` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:12
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `V` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `V` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V: 'a, W, X, Y>() {
    |                    ++++
 
 error[E0309]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:12
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `W` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W: 'a, X, Y>() {
    |                       ++++
@@ -32,42 +36,51 @@ error[E0310]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:12
    |
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |            |
+   |            the parameter type `W` must be valid for the static lifetime...
+   |            ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W: 'static, X, Y>() {
    |                       +++++++++
 
 error[E0309]: the parameter type `Y` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:12
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `Y` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `Y` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W, X, Y: 'a>() {
    |                             ++++
 
 error[E0309]: the parameter type `V` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:50
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `V` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                  ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `V` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V: 'a, W, X, Y>() {
    |                    ++++
 
 error[E0309]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:50
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `W` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                  ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W: 'a, X, Y>() {
    |                       ++++
@@ -76,42 +89,51 @@ error[E0310]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:50
    |
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
-   |                                                  ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
+   |                                                  ^^^^^^^^^^^^^^^^^^^^^
+   |                                                  |
+   |                                                  the parameter type `W` must be valid for the static lifetime...
+   |                                                  ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W: 'static, X, Y>() {
    |                       +++++++++
 
 error[E0309]: the parameter type `Y` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:19:50
    |
+18 | fn _foo<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `Y` must be valid for the lifetime `'a` as defined here...
 19 |     let _: TypeParams<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                  ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `Y` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 18 | fn _foo<'a, T, U, V, W, X, Y: 'a>() {
    |                             ++++
 
 error[E0309]: the parameter type `V` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:12
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `V` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `V` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V: 'a, W, X, Y>() {
    |                    ++++
 
 error[E0309]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:12
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `W` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W: 'a, X, Y>() {
    |                       ++++
@@ -120,42 +142,51 @@ error[E0310]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:12
    |
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |            |
+   |            the parameter type `W` must be valid for the static lifetime...
+   |            ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W: 'static, X, Y>() {
    |                       +++++++++
 
 error[E0309]: the parameter type `Y` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:12
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `Y` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `Y` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W, X, Y: 'a>() {
    |                             ++++
 
 error[E0309]: the parameter type `V` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:58
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `V` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                          ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `V` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V: 'a, W, X, Y>() {
    |                    ++++
 
 error[E0309]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:58
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `W` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                          ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W: 'a, X, Y>() {
    |                       ++++
@@ -164,20 +195,25 @@ error[E0310]: the parameter type `W` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:58
    |
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
-   |                                                          ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `W` will meet its required lifetime bounds
+   |                                                          ^^^^^^^^^^^^^^^^^^^^^
+   |                                                          |
+   |                                                          the parameter type `W` must be valid for the static lifetime...
+   |                                                          ...so that the type `W` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W: 'static, X, Y>() {
    |                       +++++++++
 
 error[E0309]: the parameter type `Y` may not live long enough
   --> tests/misc_tests/stw_ui_tests/stw_macro_type_lt_bounds-err.rs:23:58
    |
+22 | fn _bar<'a, T, U, V, W, X, Y>() {
+   |         -- the parameter type `Y` must be valid for the lifetime `'a` as defined here...
 23 |     let _: TypeParamsAngBrack<'a, T, U, V, W, X, Y, _> = MakeTypeWitness::MAKE;
    |                                                          ^^^^^^^^^^^^^^^^^^^^^ ...so that the type `Y` will meet its required lifetime bounds
    |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
    |
 22 | fn _bar<'a, T, U, V, W, X, Y: 'a>() {
    |                             ++++
diff --git a/tests/misc_tests/type_eq_ui_tests/constructor_bound-err.stderr b/tests/misc_tests/type_eq_ui_tests/constructor_bound-err.stderr
@@ -2,9 +2,12 @@ error[E0310]: the parameter type `T` may not live long enough
  --> tests/misc_tests/type_eq_ui_tests/constructor_bound-err.rs:4:5
   |
 4 |     TypeEq::<T, U>::with_any()
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `T` will meet its required lifetime bounds
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^
+  |     |
+  |     the parameter type `T` must be valid for the static lifetime...
+  |     ...so that the type `T` will meet its required lifetime bounds
   |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
   |
 3 | fn unconstrained_with_any_call<T: 'static, U>() -> Option<TypeEq<T, U>> {
   |                                 +++++++++
@@ -13,9 +16,12 @@ error[E0310]: the parameter type `U` may not live long enough
  --> tests/misc_tests/type_eq_ui_tests/constructor_bound-err.rs:4:5
   |
 4 |     TypeEq::<T, U>::with_any()
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `U` will meet its required lifetime bounds
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^
+  |     |
+  |     the parameter type `U` must be valid for the static lifetime...
+  |     ...so that the type `U` will meet its required lifetime bounds
   |
-help: consider adding an explicit lifetime bound...
+help: consider adding an explicit lifetime bound
   |
 3 | fn unconstrained_with_any_call<T, U: 'static>() -> Option<TypeEq<T, U>> {
   |                                    +++++++++
diff --git a/tests/misc_tests/type_eq_ui_tests/projection_type-err.stderr b/tests/misc_tests/type_eq_ui_tests/projection_type-err.stderr
@@ -66,7 +66,9 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type-err.rs:16:5
    |
 15 | fn in_ref_to_different_type<L, R>(te: TypeEq<L, R>) -> TypeEq<&'static u8, &'static u16> {
-   |                             - this type parameter      --------------------------------- expected `TypeEq<&'static u8, &'static u16>` because of return type
+   |                             -                          --------------------------------- expected `TypeEq<&'static u8, &'static u16>` because of return type
+   |                             |
+   |                             found this type parameter
 16 |     te.in_ref()
    |     ^^^^^^^^^^^ expected `TypeEq<&u8, &u16>`, found `TypeEq<&L, &R>`
    |
@@ -77,7 +79,9 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type-err.rs:20:5
    |
 19 | fn in_mut_to_different_type<'a, L, R>(te: TypeEq<L, R>) -> TypeEq<&'a mut u8, &'a mut u16> {
-   |                                 - this type parameter      ------------------------------- expected `TypeEq<&'a mut u8, &'a mut u16>` because of return type
+   |                                 -                          ------------------------------- expected `TypeEq<&'a mut u8, &'a mut u16>` because of return type
+   |                                 |
+   |                                 found this type parameter
 20 |     te.in_mut()
    |     ^^^^^^^^^^^ expected `TypeEq<&mut u8, &mut u16>`, found `TypeEq<&mut L, &mut R>`
    |
@@ -110,7 +114,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type-err.rs:30:5
    |
 29 | fn unmap_to_different_type<'a, L, R>(te: TypeEq<[L; 1], [R; 1]>) -> TypeEq<u8, u16> {
-   |                                - this type parameter                --------------- expected `TypeEq<u8, u16>` because of return type
+   |                                - found this type parameter          --------------- expected `TypeEq<u8, u16>` because of return type
 30 |     te.unmap(Mapper)
    |     ^^^^^^^^^^^^^^^^ expected `TypeEq<u8, u16>`, found `TypeEq<L, R>`
    |
@@ -121,7 +125,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type-err.rs:33:5
    |
 32 | fn unproject_to_different_type<'a, L, R>(te: TypeEq<[L; 1], [R; 1]>) -> TypeEq<u8, u16> {
-   |                                    - this type parameter                --------------- expected `TypeEq<u8, u16>` because of return type
+   |                                    - found this type parameter          --------------- expected `TypeEq<u8, u16>` because of return type
 33 |     te.unproject::<Mapper>()
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ expected `TypeEq<u8, u16>`, found `TypeEq<L, R>`
    |
@@ -132,7 +136,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type-err.rs:51:5
    |
 48 | fn in_array_to_different_type<'a, L, R>(
-   |                                   - this type parameter
+   |                                   - found this type parameter
 49 |     te: TypeEq<L, R>
 50 | ) -> TypeEq<[u8; 1], [u16; 1]> {
    |      ------------------------- expected `TypeEq<[u8; 1], [u16; 1]>` because of return type

diff --git a/tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.stderr b/tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.stderr
@@ -22,7 +22,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.rs:19:5
    |
 18 | fn joiner_right<A, B, C>(first: TypeNe<A, B>, second: TypeEq<B, C>) -> TypeNe<(), ()> {
-   |                 - this type parameter                                  -------------- expected `TypeNe<(), ()>` because of return type
+   |                 - found this type parameter                            -------------- expected `TypeNe<(), ()>` because of return type
 19 |     first.join_right(second)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ expected `TypeNe<(), ()>`, found `TypeNe<A, C>`
    |
@@ -33,7 +33,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.rs:23:5
    |
 22 | fn joiner_left<A, B, C>(first: TypeNe<A, B>, second: TypeEq<C, A>) -> TypeNe<(), ()> {
-   |                      - this type parameter                            -------------- expected `TypeNe<(), ()>` because of return type
+   |                      - found this type parameter                      -------------- expected `TypeNe<(), ()>` because of return type
 23 |     first.join_left(second)
    |     ^^^^^^^^^^^^^^^^^^^^^^^ expected `TypeNe<(), ()>`, found `TypeNe<C, B>`
    |
@@ -66,7 +66,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.rs:33:5
    |
 32 | fn unmap_to_different_type<'a, L, R>(te: TypeNe<[L; 1], [R; 1]>) -> TypeNe<u8, u16> {
-   |                                - this type parameter                --------------- expected `TypeNe<u8, u16>` because of return type
+   |                                - found this type parameter          --------------- expected `TypeNe<u8, u16>` because of return type
 33 |     te.unmap(Mapper)
    |     ^^^^^^^^^^^^^^^^ expected `TypeNe<u8, u16>`, found `TypeNe<L, R>`
    |
@@ -77,7 +77,7 @@ error[E0308]: mismatched types
   --> tests/misc_tests/type_eq_ui_tests/projection_type_ne-err.rs:36:5
    |
 35 | fn unproject_to_different_type<'a, L, R>(te: TypeNe<[L; 1], [R; 1]>) -> TypeNe<u8, u16> {
-   |                                    - this type parameter                --------------- expected `TypeNe<u8, u16>` because of return type
+   |                                    - found this type parameter          --------------- expected `TypeNe<u8, u16>` because of return type
 36 |     te.unproject::<Mapper>()
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ expected `TypeNe<u8, u16>`, found `TypeNe<L, R>`
    |

diff --git a/tests/misc_tests/type_fn_ui_tests/rev_typefn_impl_noninjective-err.stderr b/tests/misc_tests/type_fn_ui_tests/rev_typefn_impl_noninjective-err.stderr
@@ -2,7 +2,7 @@ error[E0271]: type mismatch resolving `<NonInjective as RevTypeFn<u8>>::Arg == T
   --> tests/misc_tests/type_fn_ui_tests/rev_typefn_impl_noninjective-err.rs:8:67
    |
 5  | impl<T> TypeFn<T> for NonInjective {
-   |      - this type parameter
+   |      - expected this type parameter
 ...
 8  |     const TYPE_FN_ASSERTS: () = { let _: typewit::CallInjFn<Self, T>; };
    |                                                                   ^ type mismatch resolving `<NonInjective as RevTypeFn<u8>>::Arg == T`