From 2059a626ff5f15d9078079c8cb6c59396c66a7e4 Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Tue, 9 Feb 2021 17:35:15 -0800
Subject: [PATCH] Update UI tests for latest nightly.

---
 core/codegen/tests/ui-fail/responder-types.stderr         | 2 +-
 core/codegen/tests/ui-fail/typed-uri-bad-type.stderr      | 6 +++---
 core/codegen/tests/ui-fail/uri_display_type_errors.stderr | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/codegen/tests/ui-fail/responder-types.stderr b/core/codegen/tests/ui-fail/responder-types.stderr
index 66105173..52d8e7d1 100644
--- a/core/codegen/tests/ui-fail/responder-types.stderr
+++ b/core/codegen/tests/ui-fail/responder-types.stderr
@@ -65,4 +65,4 @@ error[E0277]: the trait bound `usize: Responder<'_>` is not satisfied
    ::: $WORKSPACE/core/lib/src/handler.rs
     |
     |     pub fn from<T: Responder<'r>>(req: &Request, responder: T) -> Outcome<'r> {
-    |                    ------------- required by this bound in `handler::<impl rocket::Outcome<rocket::Response<'r>, rocket::http::Status, rocket::Data>>::from`
+    |                    ------------- required by this bound in `handler::<impl Outcome<rocket::Response<'r>, rocket::http::Status, rocket::Data>>::from`
diff --git a/core/codegen/tests/ui-fail/typed-uri-bad-type.stderr b/core/codegen/tests/ui-fail/typed-uri-bad-type.stderr
index 5d3496e0..2370afa6 100644
--- a/core/codegen/tests/ui-fail/typed-uri-bad-type.stderr
+++ b/core/codegen/tests/ui-fail/typed-uri-bad-type.stderr
@@ -55,11 +55,11 @@ error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::Path, Option
    = note: required because of the requirements on the impl of `FromUriParam<rocket::http::uri::Path, Option<{integer}>>` for `Option<i32>`
    = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not satisfied
+error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::uri::Path, Result<_, _>>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:65:43
    |
 65 |     uri!(optionals: id = Some(10), name = Ok("bob".into()));
-   |                                           ^^ the trait `FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not implemented for `std::string::String`
+   |                                           ^^ the trait `FromUriParam<rocket::http::uri::Path, Result<_, _>>` is not implemented for `std::string::String`
    |
    = help: the following implementations were found:
              <std::string::String as FromUriParam<P, &'a str>>
@@ -67,7 +67,7 @@ error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::u
              <std::string::String as FromUriParam<P, &'x mut &'a str>>
              <std::string::String as FromUriParam<P, &'x mut std::string::String>>
            and 2 others
-   = note: required because of the requirements on the impl of `FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` for `std::result::Result<std::string::String, &RawStr>`
+   = note: required because of the requirements on the impl of `FromUriParam<rocket::http::uri::Path, Result<_, _>>` for `Result<std::string::String, &RawStr>`
    = note: required by `from_uri_param`
 
 error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
diff --git a/core/codegen/tests/ui-fail/uri_display_type_errors.stderr b/core/codegen/tests/ui-fail/uri_display_type_errors.stderr
index 82282249..244b0c43 100644
--- a/core/codegen/tests/ui-fail/uri_display_type_errors.stderr
+++ b/core/codegen/tests/ui-fail/uri_display_type_errors.stderr
@@ -29,6 +29,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |           ^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
@@ -38,6 +39,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
@@ -47,6 +49,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Path>` is not satisfied