New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / suggestions / as-ref.stderr

diff --git a/src/test/ui/suggestions/as-ref.stderr b/src/test/ui/suggestions/as-ref.stderr
index 8143acc957b4ca243a802a432355645c413dd6e0..8445a706f4306c67f48bab203c0abd47bb689d63 100644 (file)
--- a/src/test/ui/suggestions/as-ref.stderr
+++ b/src/test/ui/suggestions/as-ref.stderr
@@ -2,66 +2,57 @@ error[E0308]: mismatched types
   --> $DIR/as-ref.rs:6:27
    |
 LL |   opt.map(|arg| takes_ref(arg));
-   |       ---                 ^^^ expected &Foo, found struct `Foo`
+   |       ---                 ^^^ expected `&Foo`, found struct `Foo`
    |       |
    |       help: consider using `as_ref` instead: `as_ref().map`
-   |
-   = note: expected type `&Foo`
-              found type `Foo`
 
 error[E0308]: mismatched types
   --> $DIR/as-ref.rs:8:37
    |
 LL |   opt.and_then(|arg| Some(takes_ref(arg)));
-   |       --------                      ^^^ expected &Foo, found struct `Foo`
+   |       --------                      ^^^ expected `&Foo`, found struct `Foo`
    |       |
    |       help: consider using `as_ref` instead: `as_ref().and_then`
-   |
-   = note: expected type `&Foo`
-              found type `Foo`
 
 error[E0308]: mismatched types
   --> $DIR/as-ref.rs:11:27
    |
 LL |   opt.map(|arg| takes_ref(arg));
-   |       ---                 ^^^ expected &Foo, found struct `Foo`
+   |       ---                 ^^^ expected `&Foo`, found struct `Foo`
    |       |
    |       help: consider using `as_ref` instead: `as_ref().map`
-   |
-   = note: expected type `&Foo`
-              found type `Foo`
 
 error[E0308]: mismatched types
   --> $DIR/as-ref.rs:13:35
    |
 LL |   opt.and_then(|arg| Ok(takes_ref(arg)));
-   |       --------                    ^^^ expected &Foo, found struct `Foo`
+   |       --------                    ^^^ expected `&Foo`, found struct `Foo`
    |       |
    |       help: consider using `as_ref` instead: `as_ref().and_then`
-   |
-   = note: expected type `&Foo`
-              found type `Foo`
 
 error[E0308]: mismatched types
   --> $DIR/as-ref.rs:16:27
    |
 LL |   let y: Option<&usize> = x;
-   |                           ^
-   |                           |
-   |                           expected enum `std::option::Option`, found reference
-   |                           help: you can convert from `&Option<T>` to `Option<&T>` using `.as_ref()`: `x.as_ref()`
+   |          --------------   ^
+   |          |                |
+   |          |                expected enum `std::option::Option`, found reference
+   |          |                help: you can convert from `&Option<T>` to `Option<&T>` using `.as_ref()`: `x.as_ref()`
+   |          expected due to this
    |
-   = note: expected type `std::option::Option<&usize>`
-              found type `&std::option::Option<usize>`
+   = note:   expected enum `std::option::Option<&usize>`
+           found reference `&std::option::Option<usize>`
 
 error[E0308]: mismatched types
   --> $DIR/as-ref.rs:19:35
    |
 LL |   let y: Result<&usize, &usize> = x;
-   |                                   ^ expected enum `std::result::Result`, found reference
+   |          ----------------------   ^ expected enum `std::result::Result`, found reference
+   |          |
+   |          expected due to this
    |
-   = note: expected type `std::result::Result<&usize, &usize>`
-              found type `&std::result::Result<usize, usize>`
+   = note:   expected enum `std::result::Result<&usize, &usize>`
+           found reference `&std::result::Result<usize, usize>`
 help: you can convert from `&Result<T, E>` to `Result<&T, &E>` using `.as_ref()`
    |
 LL |   let y: Result<&usize, &usize> = x.as_ref();
@@ -71,10 +62,12 @@ error[E0308]: mismatched types
   --> $DIR/as-ref.rs:23:34
    |
 LL |   let y: Result<&usize, usize> = x;
-   |                                  ^ expected enum `std::result::Result`, found reference
+   |          ---------------------   ^ expected enum `std::result::Result`, found reference
+   |          |
+   |          expected due to this
    |
-   = note: expected type `std::result::Result<&usize, usize>`
-              found type `&std::result::Result<usize, usize>`
+   = note:   expected enum `std::result::Result<&usize, usize>`
+           found reference `&std::result::Result<usize, usize>`
 
 error: aborting due to 7 previous errors