From 83a7fc48d2e4b6eaf83b7322580afe036c5b9ff9 Mon Sep 17 00:00:00 2001
From: Jeb Rosen <jeb@jebrosen.com>
Date: Sun, 11 Oct 2020 12:21:45 -0700
Subject: [PATCH] Update UI tests for latest nightly.

---
 .../from_form_type_errors.stderr              |  4 ++
 .../ui-fail-nightly/route-type-errors.stderr  | 40 +++++++++++++++----
 .../ui-fail-nightly/typed-uri-bad-type.stderr | 10 +++++
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr b/core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr
index 8d19b25e..6af7c5f5 100644
--- a/core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr
+++ b/core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr
@@ -3,9 +3,13 @@ error[E0277]: the trait bound `Unknown: FromFormValue<'_>` is not satisfied
   |
 7 |     field: Unknown,
   |     ^^^^^^^^^^^^^^ the trait `FromFormValue<'_>` is not implemented for `Unknown`
+  |
+  = note: required by `from_form_value`
 
 error[E0277]: the trait bound `Foo<usize>: FromFormValue<'_>` is not satisfied
   --> $DIR/from_form_type_errors.rs:14:5
    |
 14 |     field: Foo<usize>,
    |     ^^^^^^^^^^^^^^^^^ the trait `FromFormValue<'_>` is not implemented for `Foo<usize>`
+   |
+   = note: required by `from_form_value`
diff --git a/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr b/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr
index 92056465..3c2132af 100644
--- a/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr
+++ b/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr
@@ -3,24 +3,32 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   |
 6 | fn f0(foo: Q) {}
   |       ^^^^^^ the trait `FromParam<'_>` is not implemented for `Q`
+  |
+  = note: required by `from_param`
 
 error[E0277]: the trait bound `Q: FromSegments<'_>` is not satisfied
  --> $DIR/route-type-errors.rs:9:7
   |
 9 | fn f1(foo: Q) {}
   |       ^^^^^^ the trait `FromSegments<'_>` is not implemented for `Q`
+  |
+  = note: required by `from_segments`
 
 error[E0277]: the trait bound `Q: FromFormValue<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:12:7
    |
 12 | fn f2(foo: Q) {}
    |       ^^^^^^ the trait `FromFormValue<'_>` is not implemented for `Q`
+   |
+   = note: required by `from_form_value`
 
 error[E0277]: the trait bound `Q: FromQuery<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:15:7
    |
 15 | fn f3(foo: Q) {}
    |       ^^^^^^ the trait `FromQuery<'_>` is not implemented for `Q`
+   |
+   = note: required by `from_query`
 
 error[E0277]: the trait bound `Q: FromData` is not satisfied
   --> $DIR/route-type-errors.rs:18:7
@@ -31,31 +39,47 @@ error[E0277]: the trait bound `Q: FromData` is not satisfied
    = note: required because of the requirements on the impl of `FromTransformedData<'_>` for `Q`
 
 error[E0277]: the trait bound `Q: FromRequest<'_, '_>` is not satisfied
-  --> $DIR/route-type-errors.rs:21:7
-   |
-21 | fn f5(a: Q, foo: Q) {}
-   |       ^^^^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
+   --> $DIR/route-type-errors.rs:21:7
+    |
+21  | fn f5(a: Q, foo: Q) {}
+    |       ^^^^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
+    |
+   ::: $WORKSPACE/core/lib/src/request/from_request.rs
+    |
+    | #[crate::async_trait]
+    | --------------------- required by this bound in `from_request`
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:21:13
    |
 21 | fn f5(a: Q, foo: Q) {}
    |             ^^^^^^ the trait `FromParam<'_>` is not implemented for `Q`
+   |
+   = note: required by `from_param`
 
 error[E0277]: the trait bound `Q: FromRequest<'_, '_>` is not satisfied
-  --> $DIR/route-type-errors.rs:24:7
-   |
-24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
-   |       ^^^^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
+   --> $DIR/route-type-errors.rs:24:7
+    |
+24  | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
+    |       ^^^^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
+    |
+   ::: $WORKSPACE/core/lib/src/request/from_request.rs
+    |
+    | #[crate::async_trait]
+    | --------------------- required by this bound in `from_request`
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:24:13
    |
 24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
    |             ^^^^^^ the trait `FromParam<'_>` is not implemented for `Q`
+   |
+   = note: required by `from_param`
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:24:34
    |
 24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
    |                                  ^^^^^^ the trait `FromParam<'_>` is not implemented for `Q`
+   |
+   = note: required by `from_param`
diff --git a/core/codegen/tests/ui-fail-nightly/typed-uri-bad-type.stderr b/core/codegen/tests/ui-fail-nightly/typed-uri-bad-type.stderr
index 6ed27926..f3ad2517 100644
--- a/core/codegen/tests/ui-fail-nightly/typed-uri-bad-type.stderr
+++ b/core/codegen/tests/ui-fail-nightly/typed-uri-bad-type.stderr
@@ -39,6 +39,8 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Path, _>` is n
    |
 48 |     uri!(not_uri_display: 10, S);
    |                               ^ the trait `FromUriParam<rocket::http::uri::Path, _>` is not implemented for `S`
+   |
+   = note: required by `from_uri_param`
 
 error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::Path, Option<{integer}>>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:53:26
@@ -51,6 +53,7 @@ error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::Path, Option
              <i32 as FromUriParam<P, &'x mut i32>>
              <i32 as FromUriParam<P, i32>>
    = 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
   --> $DIR/typed-uri-bad-type.rs:53:43
@@ -65,6 +68,7 @@ error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::u
              <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 by `from_uri_param`
 
 error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:55:20
@@ -95,12 +99,16 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is
    |
 59 |     uri!(other_q: 100, S);
    |                        ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |
+   = note: required by `from_uri_param`
 
 error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:61:26
    |
 61 |     uri!(other_q: rest = S, id = 100);
    |                          ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |
+   = note: required by `from_uri_param`
 
 error[E0277]: the trait bound `S: Ignorable<rocket::http::uri::Query>` is not satisfied
    --> $DIR/typed-uri-bad-type.rs:36:29
@@ -139,3 +147,5 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is
    |
 65 |     uri!(other_q: rest = S, id = _);
    |                          ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |
+   = note: required by `from_uri_param`