Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

[rustc.git] / src / test / ui / generator / type-mismatch-signature-deduction.stderr

diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.stderr b/src/test/ui/generator/type-mismatch-signature-deduction.stderr
index 4abc0542c51425e36bc547249daa71e316ce90e2..30e23ea8f650c0c64fd2226697a399e585ae891b 100644 (file)
--- a/src/test/ui/generator/type-mismatch-signature-deduction.stderr
+++ b/src/test/ui/generator/type-mismatch-signature-deduction.stderr
@@ -2,11 +2,11 @@ error[E0308]: mismatched types
   --> $DIR/type-mismatch-signature-deduction.rs:13:9
    |
 LL |         5
-   |         ^ expected enum `std::result::Result`, found integer
+   |         ^ expected enum `Result`, found integer
    |
-   = note: expected type `std::result::Result<{integer}, _>`
+   = note: expected type `Result<{integer}, _>`
               found type `{integer}`
-note: return type inferred to be `std::result::Result<{integer}, _>` here
+note: return type inferred to be `Result<{integer}, _>` here
   --> $DIR/type-mismatch-signature-deduction.rs:8:20
    |
 LL |             return Ok(6);
@@ -16,9 +16,9 @@ error[E0271]: type mismatch resolving `<[generator@$DIR/type-mismatch-signature-
   --> $DIR/type-mismatch-signature-deduction.rs:5:13
    |
 LL | fn foo() -> impl Generator<Return = i32> {
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `std::result::Result`, found `i32`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `Result`, found `i32`
    |
-   = note: expected enum `std::result::Result<{integer}, _>`
+   = note: expected enum `Result<{integer}, _>`
               found type `i32`
 
 error: aborting due to 2 previous errors