rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bless tests.

Browse Source
This commit is contained in:
Camille GILLOT
2022-04-09 18:15:35 +02:00
parent 871993f7a1
commit 06af25e4f1
9 changed files with 189 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/ui/closures/issue-87461.stderr
View File

@@ -5,6 +5,12 @@ LL | Ok(())
| -- ^^ expected `u16`, found `()` | -- ^^ expected `u16`, found `()`
| | | |
| arguments to this enum variant are incorrect | 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 error[E0308]: mismatched types
--> $DIR/issue-87461.rs:17:8 --> $DIR/issue-87461.rs:17:8
@@ -13,6 +19,12 @@ LL | Ok(())
| -- ^^ expected `u16`, found `()` | -- ^^ expected `u16`, found `()`
| | | |
| arguments to this enum variant are incorrect | 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 error[E0308]: mismatched types
--> $DIR/issue-87461.rs:26:12 --> $DIR/issue-87461.rs:26:12
@@ -21,6 +33,12 @@ LL | Ok(())
| -- ^^ expected `u16`, found `()` | -- ^^ expected `u16`, found `()`
| | | |
| arguments to this enum variant are incorrect | 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 error: aborting due to 3 previous errors

12
src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
View File

@@ -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 | ------------------------- ^^^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
| | | |
| arguments to this struct are incorrect | 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 error[E0308]: mismatched types
--> $DIR/const-argument-cross-crate-mismatch.rs:8:65 --> $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 | ------------------------- ^^^^^^^^^^^^^^^ expected an array with a fixed size of 2 elements, found one with 3 elements
| | | |
| arguments to this struct are incorrect | 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 error: aborting due to 2 previous errors

5
src/test/ui/mismatched_types/issue-35030.stderr
View File

@@ -11,6 +11,11 @@ LL | Some(true)
| |
= note: expected type parameter `bool` (type parameter `bool`) = note: expected type parameter `bool` (type parameter `bool`)
found type `bool` (`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 error: aborting due to previous error

176
src/test/ui/pattern/pat-tuple-field-count-cross.stderr
View File

@@ -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 error[E0023]: this pattern has 0 fields, but the corresponding tuple struct has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:24:9 --> $DIR/pat-tuple-field-count-cross.rs:24:9
| |
LL | M() => {} LL | M() => {}
| ^^^ expected 3 fields, found 0 | ^^^ 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 struct M(
LL | | pub u8, | - tuple struct defined here
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ tuple struct has 3 fields LL | pub u8,
LL | | ); | ------ tuple struct has 3 fields
| |__- tuple struct defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 1 field, but the corresponding tuple struct has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:25:11 --> $DIR/pat-tuple-field-count-cross.rs:25:11
| |
LL | M(1) => {} LL | M(1) => {}
| ^ expected 3 fields, found 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 struct M(
LL | | pub u8, | - tuple struct defined here
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ tuple struct has 3 fields LL | pub u8,
LL | | ); | ------ tuple struct has 3 fields
| |__- tuple struct defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 2 fields, but the corresponding tuple struct has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:26:11 --> $DIR/pat-tuple-field-count-cross.rs:26:11
| |
LL | M(xyz, abc) => {} LL | M(xyz, abc) => {}
| ^^^ ^^^ expected 3 fields, found 2 | ^^^ ^^^ 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 struct M(
LL | | pub u8, | - tuple struct defined here
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ tuple struct has 3 fields LL | pub u8,
LL | | ); | ------ tuple struct has 3 fields
| |__- tuple struct defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:27:11 --> $DIR/pat-tuple-field-count-cross.rs:27:11
| |
LL | M(1, 2, 3, 4) => {} LL | M(1, 2, 3, 4) => {}
| ^ ^ ^ ^ expected 3 fields, found 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 struct M(
LL | | pub u8, | - tuple struct defined here
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ LL | pub u8,
LL | | pub u8, | ------
| | ------ tuple struct has 3 fields LL | pub u8,
LL | | ); | ------ tuple struct has 3 fields
| |__- tuple struct defined here
error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 0 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 --> $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 error[E0023]: this pattern has 0 fields, but the corresponding tuple variant has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:52:9 --> $DIR/pat-tuple-field-count-cross.rs:52:9
| |
LL | E2::M() => {} LL | E2::M() => {}
| ^^^^^^^ expected 3 fields, found 0 | ^^^^^^^ expected 3 fields, found 0
| |
::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5 ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
| |
LL | / M( LL | M(
LL | | u8, | - tuple variant defined here
| | -- LL | u8,
LL | | u8, | --
| | -- LL | u8,
LL | | u8, | --
| | -- tuple variant has 3 fields LL | u8,
LL | | ), | -- tuple variant has 3 fields
| |_____- tuple variant defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:53:15 --> $DIR/pat-tuple-field-count-cross.rs:53:15
| |
LL | E2::M(1) => {} LL | E2::M(1) => {}
| ^ expected 3 fields, found 1 | ^ expected 3 fields, found 1
| |
::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5 ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
| |
LL | / M( LL | M(
LL | | u8, | - tuple variant defined here
| | -- LL | u8,
LL | | u8, | --
| | -- LL | u8,
LL | | u8, | --
| | -- tuple variant has 3 fields LL | u8,
LL | | ), | -- tuple variant has 3 fields
| |_____- tuple variant defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:54:15 --> $DIR/pat-tuple-field-count-cross.rs:54:15
| |
LL | E2::M(xyz, abc) => {} LL | E2::M(xyz, abc) => {}
| ^^^ ^^^ expected 3 fields, found 2 | ^^^ ^^^ expected 3 fields, found 2
| |
::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5 ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
| |
LL | / M( LL | M(
LL | | u8, | - tuple variant defined here
| | -- LL | u8,
LL | | u8, | --
| | -- LL | u8,
LL | | u8, | --
| | -- tuple variant has 3 fields LL | u8,
LL | | ), | -- tuple variant has 3 fields
| |_____- tuple variant defined here
| |
help: use `_` to explicitly ignore each field 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 error[E0023]: this pattern has 4 fields, but the corresponding tuple variant has 3 fields
--> $DIR/pat-tuple-field-count-cross.rs:55:15 --> $DIR/pat-tuple-field-count-cross.rs:55:15
| |
LL | E2::M(1, 2, 3, 4) => {} LL | E2::M(1, 2, 3, 4) => {}
| ^ ^ ^ ^ expected 3 fields, found 4 | ^ ^ ^ ^ expected 3 fields, found 4
| |
::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5 ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:15:5
| |
LL | / M( LL | M(
LL | | u8, | - tuple variant defined here
| | -- LL | u8,
LL | | u8, | --
| | -- LL | u8,
LL | | u8, | --
| | -- tuple variant has 3 fields LL | u8,
LL | | ), | -- tuple variant has 3 fields
| |_____- tuple variant defined here
error: aborting due to 28 previous errors error: aborting due to 28 previous errors

5
src/test/ui/span/missing-unit-argument.stderr
View File

@@ -4,6 +4,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
LL | let _: Result<(), String> = Ok(); LL | let _: Result<(), String> = Ok();
| ^^-- an argument of type `()` is missing | ^^-- 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 help: provide the argument
| |
LL | let _: Result<(), String> = Ok(()); LL | let _: Result<(), String> = Ok(());

20
src/test/ui/suggestions/args-instead-of-tuple-errors.stderr
View File

@@ -8,6 +8,11 @@ LL | let _: Option<(i32, bool)> = Some(1, 2);
| |
= note: expected tuple `(i32, bool)` = note: expected tuple `(i32, bool)`
found type `{integer}` 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 help: remove the extra argument
| |
LL | let _: Option<(i32, bool)> = Some({(i32, bool)}); 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(); LL | let _: Option<(i8,)> = Some();
| ^^^^-- an argument of type `(i8,)` is missing | ^^^^-- 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 help: provide the argument
| |
LL | let _: Option<(i8,)> = Some({(i8,)}); LL | let _: Option<(i8,)> = Some({(i8,)});
@@ -54,6 +64,11 @@ LL | let _: Option<(i32,)> = Some(5_usize);
| |
= note: expected tuple `(i32,)` = note: expected tuple `(i32,)`
found type `usize` 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 error[E0308]: mismatched types
--> $DIR/args-instead-of-tuple-errors.rs:17:34 --> $DIR/args-instead-of-tuple-errors.rs:17:34
@@ -65,6 +80,11 @@ LL | let _: Option<(i32,)> = Some((5_usize));
| |
= note: expected tuple `(i32,)` = note: expected tuple `(i32,)`
found type `usize` 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 error: aborting due to 5 previous errors

25
src/test/ui/suggestions/args-instead-of-tuple.stderr
View File

@@ -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); 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 help: use parentheses to construct a tuple
| |
LL | let _: Result<(i32, i8), ()> = Ok((1, 2)); 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"); 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 help: use parentheses to construct a tuple
| |
LL | let _: Option<(i32, i8, &'static str)> = Some((1, 2, "hi")); 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(); LL | let _: Option<()> = Some();
| ^^^^-- an argument of type `()` is missing | ^^^^-- 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 help: provide the argument
| |
LL | let _: Option<()> = Some(()); LL | let _: Option<()> = Some(());
@@ -41,6 +56,11 @@ LL | let _: Option<(i32,)> = Some(3);
| |
= note: expected tuple `(i32,)` = note: expected tuple `(i32,)`
found type `{integer}` 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 help: use a trailing comma to create a tuple with one element
| |
LL | let _: Option<(i32,)> = Some((3,)); LL | let _: Option<(i32,)> = Some((3,));
@@ -56,6 +76,11 @@ LL | let _: Option<(i32,)> = Some((3));
| |
= note: expected tuple `(i32,)` = note: expected tuple `(i32,)`
found type `{integer}` 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 help: use a trailing comma to create a tuple with one element
| |
LL | let _: Option<(i32,)> = Some((3,)); LL | let _: Option<(i32,)> = Some((3,));

5
src/test/ui/typeck/issue-46112.stderr
View File

@@ -8,6 +8,11 @@ LL | fn main() { test(Ok(())); }
| |
= note: expected enum `Option<()>` = note: expected enum `Option<()>`
found unit type `()` 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` help: try wrapping the expression in `Some`
| |
LL | fn main() { test(Ok(Some(()))); } LL | fn main() { test(Ok(Some(()))); }

15
src/test/ui/typeck/struct-enum-wrong-args.stderr
View File

@@ -4,6 +4,11 @@ error[E0061]: this enum variant takes 1 argument but 2 arguments were supplied
LL | let _ = Some(3, 2); LL | let _ = Some(3, 2);
| ^^^^ - argument unexpected | ^^^^ - 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 help: remove the extra argument
| |
LL | let _ = Some(3); LL | let _ = Some(3);
@@ -17,6 +22,11 @@ LL | let _ = Ok(3, 6, 2);
| | | |
| argument unexpected | 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 help: remove the extra arguments
| |
LL | let _ = Ok(3); LL | let _ = Ok(3);
@@ -28,6 +38,11 @@ error[E0061]: this enum variant takes 1 argument but 0 arguments were supplied
LL | let _ = Ok(); LL | let _ = Ok();
| ^^-- an argument is missing | ^^-- 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 help: provide the argument
| |
LL | let _ = Ok({_}); LL | let _ = Ok({_});