Merge pull request #911 from dtolnay/resultui

Update ui test suite to nightly-2021-08-12

Author: dtolnay

macro/src/expand.rs

@@ -1127,9 +1127,11 @@ fn expand_rust_function_shim_super(
             Some(ret) => quote!(#ret),
             None => quote!(()),
         };
-        let impl_trait = quote_spanned!(result.span=> impl);
-        let display = quote_spanned!(rangle.span=> ::std::fmt::Display);
-        quote!(-> ::std::result::Result<#ok, #impl_trait #display>)
+        // Set spans that result in the `Result<...>` written by the user being
+        // highlighted as the cause if their error type has no Display impl.
+        let result_begin = quote_spanned!(result.span=> ::std::result::Result<#ok, impl);
+        let result_end = quote_spanned!(rangle.span=> ::std::fmt::Display>);
+        quote!(-> #result_begin #result_end)
     } else {
         expand_return_type(&sig.ret)
     };

tests/ui/array_len_suffix.stderr

@@ -7,4 +7,4 @@ error[E0308]: mismatched types
 help: change the type of the numeric literal from `u16` to `usize`
   |
 4 |         fn array() -> [String; 12usize];
-  |                                ^^^^^^^
+  |                                ~~~~~~~

tests/ui/expected_named.stderr

@@ -8,4 +8,4 @@ error[E0106]: missing lifetime specifier
 help: consider using the `'static` lifetime
   |
 5 |         fn borrowed() -> UniquePtr<Borrowed<'static>>;
-  |                                    ^^^^^^^^^^^^^^^^^
+  |                                    ~~~~~~~~~~~~~~~~~

tests/ui/unsupported_elided.stderr

@@ -16,4 +16,4 @@ error[E0106]: missing lifetime specifier
 help: consider introducing a named lifetime parameter
   |
 8 |         fn f<'a>(t: &'a T) -> &'a str;
-  |             ^^^^    ^^^^^     ^^^
+  |             ++++    ~~~~~     ~~~