Update Rust version for trybuild to 1.64

msrd0 · Sep 26, 2022 · 156b7c0 · 156b7c0
1 parent 81638d1
commit 156b7c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -77,13 +77,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.62"
+          toolchain: "1.64"
       - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo
             target
-          key: ${{runner.os}}-cargo-1.62
+          key: ${{runner.os}}-cargo-1.64
       - run: cargo test --no-default-features --features full --tests -- --ignored
 
   clippy:
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.62"
+          toolchain: "1.64"
           components: clippy
       - name: Get Rust Version
         id: rust-version

diff --git a/tests/ui/endpoint/dynamic_schema_wrong_type.stderr b/tests/ui/endpoint/dynamic_schema_wrong_type.stderr
@@ -2,7 +2,16 @@ error[E0308]: mismatched types
   --> tests/ui/endpoint/dynamic_schema_wrong_type.rs:16:21
    |
 16 | #[read_all(schema = "schema", status_codes = "status_codes")]
-   |                     ^^^^^^^^ expected `u16`, found struct `StatusCode`
+   |                     ^^^^^^^^
+   |                     |
+   |                     expected `u16`, found struct `StatusCode`
+   |                     arguments to this function are incorrect
+   |
+note: function defined here
+  --> tests/ui/endpoint/dynamic_schema_wrong_type.rs:8:4
+   |
+8  | fn schema(_: u16) -> String {
+   |    ^^^^^^ ------
 
 error[E0308]: mismatched types
   --> tests/ui/endpoint/dynamic_schema_wrong_type.rs:16:21

diff --git a/tests/ui/endpoint/invalid_body_ty.stderr b/tests/ui/endpoint/invalid_body_ty.stderr
@@ -10,10 +10,10 @@ error[E0277]: the trait bound `FooBody: OpenapiType` is not satisfied
              BTreeMap<K, V>
              BTreeSet<T>
              CStr
+             CString
              HashMap<K, V, S>
              HashSet<T, S>
-             IdPlaceholder<ID>
-           and 37 others
+           and 36 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Body`
   --> src/endpoint.rs
    |
@@ -35,7 +35,7 @@ error[E0277]: the trait bound `for<'de> FooBody: serde::de::Deserialize<'de>` is
              (T0, T1, T2)
              (T0, T1, T2, T3)
              (T0, T1, T2, T3, T4)
-           and 302 others
+           and 202 others
    = note: required because of the requirements on the impl of `serde::de::DeserializeOwned` for `FooBody`
    = note: required because of the requirements on the impl of `RequestBody` for `FooBody`
 note: required by a bound in `gotham_restful::EndpointWithSchema::Body`

diff --git a/tests/ui/endpoint/invalid_params_ty.stderr b/tests/ui/endpoint/invalid_params_ty.stderr
@@ -10,10 +10,10 @@ error[E0277]: the trait bound `FooParams: OpenapiType` is not satisfied
              BTreeMap<K, V>
              BTreeSet<T>
              CStr
+             CString
              HashMap<K, V, S>
              HashSet<T, S>
-             IdPlaceholder<ID>
-           and 37 others
+           and 36 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Params`
   --> src/endpoint.rs
    |
@@ -51,7 +51,7 @@ error[E0277]: the trait bound `FooParams: StateData` is not satisfied
              HeaderMap
              IdPlaceholder<ID>
              Method
-           and 11 others
+           and 9 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Params`
   --> src/endpoint.rs
    |
@@ -92,7 +92,7 @@ error[E0277]: the trait bound `for<'de> FooParams: serde::de::Deserialize<'de>`
              (T0, T1, T2)
              (T0, T1, T2, T3)
              (T0, T1, T2, T3, T4)
-           and 302 others
+           and 202 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Params`
   --> src/endpoint.rs
    |

diff --git a/tests/ui/endpoint/invalid_placeholders_ty.stderr b/tests/ui/endpoint/invalid_placeholders_ty.stderr
@@ -10,10 +10,10 @@ error[E0277]: the trait bound `FooPlaceholders: OpenapiType` is not satisfied
              BTreeMap<K, V>
              BTreeSet<T>
              CStr
+             CString
              HashMap<K, V, S>
              HashSet<T, S>
-             IdPlaceholder<ID>
-           and 37 others
+           and 36 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Placeholders`
   --> src/endpoint.rs
    |
@@ -51,7 +51,7 @@ error[E0277]: the trait bound `FooPlaceholders: StateData` is not satisfied
              HeaderMap
              IdPlaceholder<ID>
              Method
-           and 11 others
+           and 9 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Placeholders`
   --> src/endpoint.rs
    |
@@ -92,7 +92,7 @@ error[E0277]: the trait bound `for<'de> FooPlaceholders: serde::de::Deserialize<
              (T0, T1, T2)
              (T0, T1, T2, T3)
              (T0, T1, T2, T3, T4)
-           and 302 others
+           and 202 others
 note: required by a bound in `gotham_restful::EndpointWithSchema::Placeholders`
   --> src/endpoint.rs
    |