Update UI tests for latest nightly.

jakubdabek · Aug 20, 2021 · 15e74fe · 15e74fe
1 parent a361bbd
commit 15e74fe
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 29 deletions.
diff --git a/contrib/db_pools/codegen/tests/ui-fail-nightly/database-types.stderr b/contrib/db_pools/codegen/tests/ui-fail-nightly/database-types.stderr
@@ -4,18 +4,20 @@ error[E0277]: the trait bound `Unknown: Pool` is not satisfied
 7  | struct A(Unknown);
    |          ^^^^^^^ the trait `Pool` is not implemented for `Unknown`
    |
-  ::: $WORKSPACE/contrib/db_pools/lib/src/database.rs
+note: required by a bound in `rocket_db_pools::Database::Pool`
+  --> $DIR/database.rs:41:16
    |
-   |     type Pool: Pool;
-   |                ---- required by this bound in `rocket_db_pools::Database::Pool`
+41 |     type Pool: Pool;
+   |                ^^^^ required by this bound in `rocket_db_pools::Database::Pool`
 
 error[E0277]: the trait bound `Vec<i32>: Pool` is not satisfied
   --> $DIR/database-types.rs:11:10
    |
 11 | struct B(Vec<i32>);
    |          ^^^^^^^^ the trait `Pool` is not implemented for `Vec<i32>`
    |
-  ::: $WORKSPACE/contrib/db_pools/lib/src/database.rs
+note: required by a bound in `rocket_db_pools::Database::Pool`
+  --> $DIR/database.rs:41:16
    |
-   |     type Pool: Pool;
-   |                ---- required by this bound in `rocket_db_pools::Database::Pool`
+41 |     type Pool: Pool;
+   |                ^^^^ required by this bound in `rocket_db_pools::Database::Pool`
diff --git a/contrib/sync_db_pools/codegen/tests/ui-fail-nightly/database-types.stderr b/contrib/sync_db_pools/codegen/tests/ui-fail-nightly/database-types.stderr
@@ -4,18 +4,20 @@ error[E0277]: the trait bound `Unknown: Poolable` is not satisfied
 6  | struct A(Unknown);
    |          ^^^^^^^ the trait `Poolable` is not implemented for `Unknown`
    |
-  ::: $WORKSPACE/contrib/sync_db_pools/lib/src/connection.rs
+note: required by a bound in `rocket_sync_db_pools::Connection`
+  --> $DIR/connection.rs:44:29
    |
-   | pub struct Connection<K, C: Poolable> {
-   |                             -------- required by this bound in `rocket_sync_db_pools::Connection`
+44 | pub struct Connection<K, C: Poolable> {
+   |                             ^^^^^^^^ required by this bound in `rocket_sync_db_pools::Connection`
 
 error[E0277]: the trait bound `Vec<i32>: Poolable` is not satisfied
   --> $DIR/database-types.rs:9:10
    |
 9  | struct B(Vec<i32>);
    |          ^^^^^^^^ the trait `Poolable` is not implemented for `Vec<i32>`
    |
-  ::: $WORKSPACE/contrib/sync_db_pools/lib/src/connection.rs
+note: required by a bound in `rocket_sync_db_pools::Connection`
+  --> $DIR/connection.rs:44:29
    |
-   | pub struct Connection<K, C: Poolable> {
-   |                             -------- required by this bound in `rocket_sync_db_pools::Connection`
+44 | pub struct Connection<K, C: Poolable> {
+   |                             ^^^^^^^^ required by this bound in `rocket_sync_db_pools::Connection`
diff --git a/core/codegen/tests/ui-fail-nightly/from_form.stderr b/core/codegen/tests/ui-fail-nightly/from_form.stderr
@@ -492,6 +492,6 @@ error[E0308]: mismatched types
 help: try using a conversion method
     |
 203 |     #[field(default_with = Some("hi".to_string()))]
-    |                                     ^^^^^^^^^^^^
+    |                                     ++++++++++++
 203 |     #[field(default_with = Some("hi".to_string()))]
-    |                                     ^^^^^^^^^^^^
+    |                                     ++++++++++++
diff --git a/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr b/core/codegen/tests/ui-fail-nightly/route-type-errors.stderr
@@ -44,21 +44,23 @@ error[E0277]: the trait bound `Q: FromData<'_>` is not satisfied
 18  | fn f4(foo: Q) {}
     |            ^ the trait `FromData<'_>` is not implemented for `Q`
     |
-   ::: $WORKSPACE/core/lib/src/data/from_data.rs
+note: required by a bound in `rocket::data::FromData::from_data`
+   --> $DIR/from_data.rs:194:41
     |
-    |     async fn from_data(req: &'r Request<'_>, data: Data<'r>) -> Outcome<'r, Self>;
-    |                                         -- required by this bound in `rocket::data::FromData::from_data`
+194 |     async fn from_data(req: &'r Request<'_>, data: Data<'r>) -> Outcome<'r, Self>;
+    |                                         ^^ required by this bound in `rocket::data::FromData::from_data`
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
    --> $DIR/route-type-errors.rs:21:10
     |
 21  | fn f5(a: Q, foo: Q) {}
     |          ^ the trait `FromRequest<'_>` is not implemented for `Q`
     |
-   ::: $WORKSPACE/core/lib/src/request/from_request.rs
+note: required by a bound in `from_request`
+   --> $DIR/from_request.rs:388:48
     |
-    |     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error>;
-    |                                                -- required by this bound in `from_request`
+388 |     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error>;
+    |                                                ^^ required by this bound in `from_request`
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
    --> $DIR/route-type-errors.rs:21:18
@@ -78,10 +80,11 @@ error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
 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
+note: required by a bound in `from_request`
+   --> $DIR/from_request.rs:388:48
     |
-    |     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error>;
-    |                                                -- required by this bound in `from_request`
+388 |     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error>;
+    |                                                ^^ required by this bound in `from_request`
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
    --> $DIR/route-type-errors.rs:24:18

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
@@ -162,21 +162,23 @@ error[E0277]: the trait bound `S: Ignorable<rocket::http::uri::fmt::Query>` is n
 66  |     uri!(other_q(rest = _, id = 100));
     |                         ^ the trait `Ignorable<rocket::http::uri::fmt::Query>` is not implemented for `S`
     |
-   ::: $WORKSPACE/core/http/src/uri/fmt/uri_display.rs
+note: required by a bound in `assert_ignorable`
+   --> $DIR/uri_display.rs:544:37
     |
-    | pub fn assert_ignorable<P: Part, T: Ignorable<P>>() {  }
-    |                                     ------------ required by this bound in `assert_ignorable`
+544 | pub fn assert_ignorable<P: Part, T: Ignorable<P>>() {  }
+    |                                     ^^^^^^^^^^^^ required by this bound in `assert_ignorable`
 
 error[E0277]: the trait bound `usize: Ignorable<rocket::http::uri::fmt::Query>` is not satisfied
    --> $DIR/typed-uri-bad-type.rs:68:33
     |
 68  |     uri!(other_q(rest = S, id = _));
     |                                 ^ the trait `Ignorable<rocket::http::uri::fmt::Query>` is not implemented for `usize`
     |
-   ::: $WORKSPACE/core/http/src/uri/fmt/uri_display.rs
+note: required by a bound in `assert_ignorable`
+   --> $DIR/uri_display.rs:544:37
     |
-    | pub fn assert_ignorable<P: Part, T: Ignorable<P>>() {  }
-    |                                     ------------ required by this bound in `assert_ignorable`
+544 | pub fn assert_ignorable<P: Part, T: Ignorable<P>>() {  }
+    |                                     ^^^^^^^^^^^^ required by this bound in `assert_ignorable`
 
 error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>` is not satisfied
    --> $DIR/typed-uri-bad-type.rs:68:25