Bless tests.

diff --git a/src/test/ui/closures/issue-87461.stderr b/src/test/ui/closures/issue-87461.stderr
index b35fa2b8c9aba0951f7547f2f0d8bb26eef2e611..0e788a16eb0411fffe661c2069146868aa732f0a 100644 (file)
--- a/src/test/ui/closures/issue-87461.stderr
+++ b/src/test/ui/closures/issue-87461.stderr
@@ -5,6 +5,12 @@ LL |     Ok(())
    |     -- ^^ expected `u16`, found `()`
    |     |
    |     arguments to this enum variant are incorrect
+   |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 
 error[E0308]: mismatched types
   --> $DIR/issue-87461.rs:17:8
@@ -13,6 +19,12 @@ LL |     Ok(())
    |     -- ^^ expected `u16`, found `()`
    |     |
    |     arguments to this enum variant are incorrect
+   |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 
 error[E0308]: mismatched types
   --> $DIR/issue-87461.rs:26:12
@@ -21,6 +33,12 @@ LL |         Ok(())
    |         -- ^^ expected `u16`, found `()`
    |         |
    |         arguments to this enum variant are incorrect
+   |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 
 error: aborting due to 3 previous errors
 

diff --git a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr b/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
index 42f469d9817813c0a5fdec0a33d6f42562ab2f01..d5eefd35753656684210249213720a35f6021370 100644 (file)
--- a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
+++ b/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
@@ -5,6 +5,12 @@ LL |     let _ = const_generic_lib::function(const_generic_lib::Struct([0u8, 1u8
    |                                         ------------------------- ^^^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
    |                                         |
    |                                         arguments to this struct are incorrect
+   |
+note: tuple struct defined here
+  --> $DIR/auxiliary/const_generic_lib.rs:1:12
+   |
+LL | pub struct Struct<const N: usize>(pub [u8; N]);
+   |            ^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/const-argument-cross-crate-mismatch.rs:8:65
@@ -13,6 +19,12 @@ LL |     let _: const_generic_lib::Alias = const_generic_lib::Struct([0u8, 1u8,
    |                                       ------------------------- ^^^^^^^^^^^^^^^ expected an array with a fixed size of 2 elements, found one with 3 elements
    |                                       |
    |                                       arguments to this struct are incorrect
+   |
+note: tuple struct defined here
+  --> $DIR/auxiliary/const_generic_lib.rs:1:12
+   |
+LL | pub struct Struct<const N: usize>(pub [u8; N]);
+   |            ^^^^^^
 
 error: aborting due to 2 previous errors
 

diff --git a/src/test/ui/mismatched_types/issue-35030.stderr b/src/test/ui/mismatched_types/issue-35030.stderr
index f0dea75001c2ce7cca6ffd46cfd5bc822a8f8323..5ea9bcfc122cb31df5cd24b3c9467a8672d01adb 100644 (file)
--- a/src/test/ui/mismatched_types/issue-35030.stderr
+++ b/src/test/ui/mismatched_types/issue-35030.stderr
@@ -11,6 +11,11 @@ LL |         Some(true)
    |
    = note: expected type parameter `bool` (type parameter `bool`)
                         found type `bool` (`bool`)
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 
 error: aborting due to previous error
 

diff --git a/src/test/ui/pattern/pat-tuple-field-count-cross.stderr b/src/test/ui/pattern/pat-tuple-field-count-cross.stderr
index cab8d4759df6414b2c49a38fa63994ed9640c00e..07b678bc8731a299730bcfff836803d2196385f5 100644 (file)
--- a/src/test/ui/pattern/pat-tuple-field-count-cross.stderr
+++ b/src/test/ui/pattern/pat-tuple-field-count-cross.stderr
@@ -198,20 +198,19 @@ LL | pub struct S(pub u8, pub u8, pub u8);
 error[E0023]: this pattern has 0 fields, but the corresponding tuple struct has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:24:9
    |
-LL |           M() => {}
-   |           ^^^ expected 3 fields, found 0
+LL |         M() => {}
+   |         ^^^ expected 3 fields, found 0
    |
-  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:1
+  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:12
    |
-LL | / pub struct M(
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------ tuple struct has 3 fields
-LL | | );
-   | |__- tuple struct defined here
+LL | pub struct M(
+   |            - tuple struct defined here
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------ tuple struct has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -225,20 +224,19 @@ LL |         M(..) => {}
 error[E0023]: this pattern has 1 field, but the corresponding tuple struct has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:25:11
    |
-LL |           M(1) => {}
-   |             ^ expected 3 fields, found 1
+LL |         M(1) => {}
+   |           ^ expected 3 fields, found 1
    |
-  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:1
+  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:12
    |
-LL | / pub struct M(
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------ tuple struct has 3 fields
-LL | | );
-   | |__- tuple struct defined here
+LL | pub struct M(
+   |            - tuple struct defined here
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------ tuple struct has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -252,20 +250,19 @@ LL |         M(1, ..) => {}
 error[E0023]: this pattern has 2 fields, but the corresponding tuple struct has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:26:11
    |
-LL |           M(xyz, abc) => {}
-   |             ^^^  ^^^ expected 3 fields, found 2
+LL |         M(xyz, abc) => {}
+   |           ^^^  ^^^ expected 3 fields, found 2
    |
-  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:1
+  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:12
    |
-LL | / pub struct M(
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------ tuple struct has 3 fields
-LL | | );
-   | |__- tuple struct defined here
+LL | pub struct M(
+   |            - tuple struct defined here
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------ tuple struct has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -275,20 +272,19 @@ LL |         M(xyz, abc, _) => {}
 error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:27:11
    |
-LL |           M(1, 2, 3, 4) => {}
-   |             ^  ^  ^  ^ expected 3 fields, found 4
+LL |         M(1, 2, 3, 4) => {}
+   |           ^  ^  ^  ^ expected 3 fields, found 4
    |
-  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:1
+  ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:5:12
    |
-LL | / pub struct M(
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------
-LL | |     pub u8,
-   | |     ------ tuple struct has 3 fields
-LL | | );
-   | |__- tuple struct defined here
+LL | pub struct M(
+   |            - tuple struct defined here
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------
+LL |     pub u8,
+   |     ------ tuple struct has 3 fields
 
 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 0 fields
   --> $DIR/pat-tuple-field-count-cross.rs:36:16
@@ -438,20 +434,19 @@ LL |     S(u8, u8, u8),
 error[E0023]: this pattern has 0 fields, but the corresponding tuple variant has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:52:9
    |
-LL |           E2::M() => {}
-   |           ^^^^^^^ expected 3 fields, found 0
+LL |         E2::M() => {}
+   |         ^^^^^^^ expected 3 fields, found 0
    |
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
    |
-LL | /     M(
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         -- tuple variant has 3 fields
-LL | |     ),
-   | |_____- tuple variant defined here
+LL |     M(
+   |     - tuple variant defined here
+LL |         u8,
+   |         --
+LL |         u8,
+   |         --
+LL |         u8,
+   |         -- tuple variant has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -465,20 +460,19 @@ LL |         E2::M(..) => {}
 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:53:15
    |
-LL |           E2::M(1) => {}
-   |                 ^ expected 3 fields, found 1
+LL |         E2::M(1) => {}
+   |               ^ expected 3 fields, found 1
    |
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
    |
-LL | /     M(
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         -- tuple variant has 3 fields
-LL | |     ),
-   | |_____- tuple variant defined here
+LL |     M(
+   |     - tuple variant defined here
+LL |         u8,
+   |         --
+LL |         u8,
+   |         --
+LL |         u8,
+   |         -- tuple variant has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -492,20 +486,19 @@ LL |         E2::M(1, ..) => {}
 error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:54:15
    |
-LL |           E2::M(xyz, abc) => {}
-   |                 ^^^  ^^^ expected 3 fields, found 2
+LL |         E2::M(xyz, abc) => {}
+   |               ^^^  ^^^ expected 3 fields, found 2
    |
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
    |
-LL | /     M(
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         -- tuple variant has 3 fields
-LL | |     ),
-   | |_____- tuple variant defined here
+LL |     M(
+   |     - tuple variant defined here
+LL |         u8,
+   |         --
+LL |         u8,
+   |         --
+LL |         u8,
+   |         -- tuple variant has 3 fields
    |
 help: use `_` to explicitly ignore each field
    |
@@ -515,20 +508,19 @@ LL |         E2::M(xyz, abc, _) => {}
 error[E0023]: this pattern has 4 fields, but the corresponding tuple variant has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:55:15
    |
-LL |           E2::M(1, 2, 3, 4) => {}
-   |                 ^  ^  ^  ^ expected 3 fields, found 4
+LL |         E2::M(1, 2, 3, 4) => {}
+   |               ^  ^  ^  ^ expected 3 fields, found 4
    |
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
    |
-LL | /     M(
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         --
-LL | |         u8,
-   | |         -- tuple variant has 3 fields
-LL | |     ),
-   | |_____- tuple variant defined here
+LL |     M(
+   |     - tuple variant defined here
+LL |         u8,
+   |         --
+LL |         u8,
+   |         --
+LL |         u8,
+   |         -- tuple variant has 3 fields
 
 error: aborting due to 28 previous errors
 

diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr
index c8e1a23288751a912fce8bb67605cab9419da7d9..e68260e4a09407da1353a7f4f58d03c7b4e8fd98 100644 (file)
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/src/test/ui/span/missing-unit-argument.stderr
@@ -4,6 +4,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
 LL |     let _: Result<(), String> = Ok();
    |                                 ^^-- an argument of type `()` is missing
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 help: provide the argument
    |
 LL |     let _: Result<(), String> = Ok(());

diff --git a/src/test/ui/suggestions/args-instead-of-tuple-errors.stderr b/src/test/ui/suggestions/args-instead-of-tuple-errors.stderr
index 991dde30629e93539f9ebf167cef79901ba384cf..aacbe1d9efb1f53208642dce6b6c17c78a5acb74 100644 (file)
--- a/src/test/ui/suggestions/args-instead-of-tuple-errors.stderr
+++ b/src/test/ui/suggestions/args-instead-of-tuple-errors.stderr
@@ -8,6 +8,11 @@ LL |     let _: Option<(i32, bool)> = Some(1, 2);
    |
    = note: expected tuple `(i32, bool)`
                found type `{integer}`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: remove the extra argument
    |
 LL |     let _: Option<(i32, bool)> = Some({(i32, bool)});
@@ -39,6 +44,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
 LL |     let _: Option<(i8,)> = Some();
    |                            ^^^^-- an argument of type `(i8,)` is missing
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: provide the argument
    |
 LL |     let _: Option<(i8,)> = Some({(i8,)});
@@ -54,6 +64,11 @@ LL |     let _: Option<(i32,)> = Some(5_usize);
    |
    = note: expected tuple `(i32,)`
                found type `usize`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 
 error[E0308]: mismatched types
   --> $DIR/args-instead-of-tuple-errors.rs:17:34
@@ -65,6 +80,11 @@ LL |     let _: Option<(i32,)> = Some((5_usize));
    |
    = note: expected tuple `(i32,)`
                found type `usize`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 
 error: aborting due to 5 previous errors
 

diff --git a/src/test/ui/suggestions/args-instead-of-tuple.stderr b/src/test/ui/suggestions/args-instead-of-tuple.stderr
index 7ec10e88142c11c76f5b8b21746bd6457f85d518..f6d158782dad2b02fdd9ec87864c4fd6d58a92ce 100644 (file)
--- a/src/test/ui/suggestions/args-instead-of-tuple.stderr
+++ b/src/test/ui/suggestions/args-instead-of-tuple.stderr
@@ -4,6 +4,11 @@ error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
 LL |     let _: Result<(i32, i8), ()> = Ok(1, 2);
    |                                    ^^
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 help: use parentheses to construct a tuple
    |
 LL |     let _: Result<(i32, i8), ()> = Ok((1, 2));
@@ -15,6 +20,11 @@ error[E0061]: this enum variant takes 1 argument but 3 arguments were supplied
 LL |     let _: Option<(i32, i8, &'static str)> = Some(1, 2, "hi");
    |                                              ^^^^
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: use parentheses to construct a tuple
    |
 LL |     let _: Option<(i32, i8, &'static str)> = Some((1, 2, "hi"));
@@ -26,6 +36,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
 LL |     let _: Option<()> = Some();
    |                         ^^^^-- an argument of type `()` is missing
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: provide the argument
    |
 LL |     let _: Option<()> = Some(());
@@ -41,6 +56,11 @@ LL |     let _: Option<(i32,)> = Some(3);
    |
    = note: expected tuple `(i32,)`
                found type `{integer}`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: use a trailing comma to create a tuple with one element
    |
 LL |     let _: Option<(i32,)> = Some((3,));
@@ -56,6 +76,11 @@ LL |     let _: Option<(i32,)> = Some((3));
    |
    = note: expected tuple `(i32,)`
                found type `{integer}`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: use a trailing comma to create a tuple with one element
    |
 LL |     let _: Option<(i32,)> = Some((3,));

diff --git a/src/test/ui/typeck/issue-46112.stderr b/src/test/ui/typeck/issue-46112.stderr
index 9346150750128c4b61fdd256e71d081a0d086df4..91381e8ef4acf6ebff0d94551cacae652a7a5f6b 100644 (file)
--- a/src/test/ui/typeck/issue-46112.stderr
+++ b/src/test/ui/typeck/issue-46112.stderr
@@ -8,6 +8,11 @@ LL | fn main() { test(Ok(())); }
    |
    = note:   expected enum `Option<()>`
            found unit type `()`
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 help: try wrapping the expression in `Some`
    |
 LL | fn main() { test(Ok(Some(()))); }

diff --git a/src/test/ui/typeck/struct-enum-wrong-args.stderr b/src/test/ui/typeck/struct-enum-wrong-args.stderr
index 721b2c821efec8b185b68d0d3918795a960c9647..aafb29f25d0bdbbe537d89ea964b6ff2fbb5da9b 100644 (file)
--- a/src/test/ui/typeck/struct-enum-wrong-args.stderr
+++ b/src/test/ui/typeck/struct-enum-wrong-args.stderr
@@ -4,6 +4,11 @@ error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
 LL |     let _ = Some(3, 2);
    |             ^^^^    - argument unexpected
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^^^
 help: remove the extra argument
    |
 LL |     let _ = Some(3);
@@ -17,6 +22,11 @@ LL |     let _ = Ok(3, 6, 2);
    |                   |
    |                   argument unexpected
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 help: remove the extra arguments
    |
 LL |     let _ = Ok(3);
@@ -28,6 +38,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
 LL |     let _ = Ok();
    |             ^^-- an argument is missing
    |
+note: tuple variant defined here
+  --> $SRC_DIR/core/src/result.rs:LL:COL
+   |
+LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
+   |     ^^
 help: provide the argument
    |
 LL |     let _ = Ok({_});