nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests.

Browse Source
This commit is contained in:
Mara Bos 2021-11-04 17:57:30 +01:00
parent b331b66082
commit 48777561ca
9 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/ui/did_you_mean/issue-42764.rs
View File

@ -10,7 +10,7 @@ fn main() {
let n: usize = 42;
this_function_expects_a_double_option(n);
//~^ ERROR mismatched types
//~| HELP try using a variant of the expected enum
//~| HELP try wrapping the expression in a variant of `DoubleOption`
}

8
src/test/ui/did_you_mean/issue-42764.stderr
View File

@ -6,12 +6,12 @@ LL | this_function_expects_a_double_option(n);
|
= note: expected enum `DoubleOption<_>`
found type `usize`
help: try using a variant of the expected enum
help: try wrapping the expression in a variant of `DoubleOption`
|
LL | this_function_expects_a_double_option(DoubleOption::AlternativeSome(n));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LL | this_function_expects_a_double_option(DoubleOption::FirstSome(n));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~
| ++++++++++++++++++++++++ +
LL | this_function_expects_a_double_option(DoubleOption::AlternativeSome(n));
| ++++++++++++++++++++++++++++++ +
error[E0308]: mismatched types
--> $DIR/issue-42764.rs:27:33

9
src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr
View File

@ -2,13 +2,14 @@ error[E0308]: mismatched types
--> $DIR/fully-qualified-type-name1.rs:5:9
|
LL | x = 5;
| ^
| |
| expected enum `Option`, found integer
| help: try using a variant of the expected enum: `Some(5)`
| ^ expected enum `Option`, found integer
|
= note: expected enum `Option<usize>`
found type `{integer}`
help: try wrapping the expression in `Some`
|
LL | x = Some(5);
| +++++ +
error: aborting due to previous error

9
src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr
View File

@ -4,13 +4,14 @@ error[E0308]: mismatched types
LL | fn bar(x: usize) -> Option<usize> {
| ------------- expected `Option<usize>` because of return type
LL | return x;
| ^
| |
| expected enum `Option`, found `usize`
| help: try using a variant of the expected enum: `Some(x)`
| ^ expected enum `Option`, found `usize`
|
= note: expected enum `Option<usize>`
found type `usize`
help: try wrapping the expression in `Some`
|
LL | return Some(x);
| +++++ +
error: aborting due to previous error

4
src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr
View File

@ -12,10 +12,10 @@ help: try removing this `?`
LL - missing_discourses()?
LL + missing_discourses()
|
help: try using a variant of the expected enum
help: try wrapping the expression in `Ok`
|
LL | Ok(missing_discourses()?)
|
| +++ +
error: aborting due to previous error

18
src/test/ui/mismatched_types/abridged.stderr
View File

@ -26,13 +26,14 @@ error[E0308]: mismatched types
LL | fn b() -> Option<Foo> {
| ----------- expected `Option<Foo>` because of return type
LL | Foo { bar: 1 }
| ^^^^^^^^^^^^^^
| |
| expected enum `Option`, found struct `Foo`
| help: try using a variant of the expected enum: `Some(Foo { bar: 1 })`
| ^^^^^^^^^^^^^^ expected enum `Option`, found struct `Foo`
|
= note: expected enum `Option<Foo>`
found struct `Foo`
help: try wrapping the expression in `Some`
|
LL | Some(Foo { bar: 1 })
| +++++ +
error[E0308]: mismatched types
--> $DIR/abridged.rs:28:5
@ -40,13 +41,14 @@ error[E0308]: mismatched types
LL | fn c() -> Result<Foo, Bar> {
| ---------------- expected `Result<Foo, Bar>` because of return type
LL | Foo { bar: 1 }
| ^^^^^^^^^^^^^^
| |
| expected enum `Result`, found struct `Foo`
| help: try using a variant of the expected enum: `Ok(Foo { bar: 1 })`
| ^^^^^^^^^^^^^^ expected enum `Result`, found struct `Foo`
|
= note: expected enum `Result<Foo, Bar>`
found struct `Foo`
help: try wrapping the expression in `Ok`
|
LL | Ok(Foo { bar: 1 })
| +++ +
error[E0308]: mismatched types
--> $DIR/abridged.rs:39:5

10
src/test/ui/pattern/pat-type-err-let-stmt.stderr
View File

@ -2,14 +2,16 @@ error[E0308]: mismatched types
--> $DIR/pat-type-err-let-stmt.rs:6:29
|
LL | let Ok(0): Option<u8> = 42u8;
| ---------- ^^^^
| | |
| | expected enum `Option`, found `u8`
| | help: try using a variant of the expected enum: `Some(42u8)`
| ---------- ^^^^ expected enum `Option`, found `u8`
| |
| expected due to this
|
= note: expected enum `Option<u8>`
found type `u8`
help: try wrapping the expression in `Some`
|
LL | let Ok(0): Option<u8> = Some(42u8);
| +++++ +
error[E0308]: mismatched types
--> $DIR/pat-type-err-let-stmt.rs:6:9

10
src/test/ui/suggestions/suggest-full-enum-variant-for-local-module.stderr
View File

@ -2,14 +2,16 @@ error[E0308]: mismatched types
--> $DIR/suggest-full-enum-variant-for-local-module.rs:9:28
|
LL | let _: option::O<()> = ();
| ------------- ^^
| | |
| | expected enum `O`, found `()`
| | help: try using a variant of the expected enum: `option::O::Some(())`
| ------------- ^^ expected enum `O`, found `()`
| |
| expected due to this
|
= note: expected enum `O<()>`
found unit type `()`
help: try wrapping the expression in `option::O::Some`
|
LL | let _: option::O<()> = option::O::Some(());
| ++++++++++++++++ +
error: aborting due to previous error

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

@ -2,13 +2,14 @@ error[E0308]: mismatched types
--> $DIR/issue-46112.rs:9:21
|
LL | fn main() { test(Ok(())); }
| ^^
| |
| expected enum `Option`, found `()`
| help: try using a variant of the expected enum: `Some(())`
| ^^ expected enum `Option`, found `()`
|
= note: expected enum `Option<()>`
found unit type `()`
help: try wrapping the expression in `Some`
|
LL | fn main() { test(Ok(Some(()))); }
| +++++ +
error: aborting due to previous error