From 43bfe6189482203b794ead097f175ae22f7e0bfa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:03:20 -0700 Subject: [PATCH] Update Rust to v1.64.0 (#444) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Pacheco --- dropshot/tests/fail/bad_endpoint10.stderr | 7 +++---- dropshot/tests/fail/bad_endpoint15.stderr | 14 ++++++++------ dropshot/tests/fail/bad_endpoint3.stderr | 7 +++---- dropshot/tests/fail/bad_endpoint4.stderr | 4 ++-- dropshot/tests/fail/bad_endpoint5.stderr | 2 +- dropshot/tests/fail/bad_endpoint7.stderr | 2 +- rust-toolchain.toml | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dropshot/tests/fail/bad_endpoint10.stderr b/dropshot/tests/fail/bad_endpoint10.stderr index 5a3eb8a5d..d105602e2 100644 --- a/dropshot/tests/fail/bad_endpoint10.stderr +++ b/dropshot/tests/fail/bad_endpoint10.stderr @@ -14,18 +14,17 @@ note: required by a bound in `validate_result_error_type` | ^^^^^^ required by this bound in `validate_result_error_type` error[E0277]: the trait bound `fn(Arc>) -> impl Future, String>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_error_type}: dropshot::handler::HttpHandlerFunc<_, _, _>` is not satisfied - --> tests/fail/bad_endpoint10.rs:14:10 + --> tests/fail/bad_endpoint10.rs:10:1 | 10 | / #[endpoint { 11 | | method = GET, 12 | | path = "/test", 13 | | }] - | |__- required by a bound introduced by this call -14 | async fn bad_error_type( - | ^^^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>) -> impl Future, String>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_error_type}` + | |__^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>) -> impl Future, String>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_error_type}` | note: required by a bound in `ApiEndpoint::::new` --> src/api_description.rs | | HandlerType: HttpHandlerFunc, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ApiEndpoint::::new` + = note: this error originates in the attribute macro `endpoint` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/dropshot/tests/fail/bad_endpoint15.stderr b/dropshot/tests/fail/bad_endpoint15.stderr index 9680f88d1..f87212759 100644 --- a/dropshot/tests/fail/bad_endpoint15.stderr +++ b/dropshot/tests/fail/bad_endpoint15.stderr @@ -1,25 +1,27 @@ error[E0277]: the trait bound `fn(Arc>) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _, _>` is not satisfied - --> tests/fail/bad_endpoint15.rs:17:10 + --> tests/fail/bad_endpoint15.rs:13:1 | 13 | / #[endpoint { 14 | | method = GET, 15 | | path = "/test", 16 | | }] - | |__- required by a bound introduced by this call -17 | async fn bad_endpoint( - | ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}` + | |__^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}` | note: required by a bound in `ApiEndpoint::::new` --> src/api_description.rs | | HandlerType: HttpHandlerFunc, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ApiEndpoint::::new` + = note: this error originates in the attribute macro `endpoint` (in Nightly builds, run with -Z macro-backtrace for more info) error: future cannot be sent between threads safely --> tests/fail/bad_endpoint15.rs:13:1 | -13 | #[endpoint { - | ^^^^^^^^^^ future returned by `bad_endpoint` is not `Send` +13 | / #[endpoint { +14 | | method = GET, +15 | | path = "/test", +16 | | }] + | |__^ future returned by `bad_endpoint` is not `Send` | = help: within `impl Future, HttpError>>`, the trait `Send` is not implemented for `Rc` note: future is not `Send` as this value is used across an await diff --git a/dropshot/tests/fail/bad_endpoint3.stderr b/dropshot/tests/fail/bad_endpoint3.stderr index 290bb48c6..71b301a72 100644 --- a/dropshot/tests/fail/bad_endpoint3.stderr +++ b/dropshot/tests/fail/bad_endpoint3.stderr @@ -28,18 +28,17 @@ note: required by a bound in `need_extractor` = note: this error originates in the attribute macro `endpoint` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: the trait bound `fn(Arc>, String) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _, _>` is not satisfied - --> tests/fail/bad_endpoint3.rs:15:10 + --> tests/fail/bad_endpoint3.rs:11:1 | 11 | / #[endpoint { 12 | | method = GET, 13 | | path = "/test", 14 | | }] - | |__- required by a bound introduced by this call -15 | async fn bad_endpoint( - | ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>, String) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}` + | |__^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for `fn(Arc>, String) -> impl Future, HttpError>> { for ApiEndpoint<> as RequestContextArgument>::Context>>::from::bad_endpoint}` | note: required by a bound in `ApiEndpoint::::new` --> src/api_description.rs | | HandlerType: HttpHandlerFunc, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ApiEndpoint::::new` + = note: this error originates in the attribute macro `endpoint` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/dropshot/tests/fail/bad_endpoint4.stderr b/dropshot/tests/fail/bad_endpoint4.stderr index 137ae560a..7476539c0 100644 --- a/dropshot/tests/fail/bad_endpoint4.stderr +++ b/dropshot/tests/fail/bad_endpoint4.stderr @@ -13,7 +13,7 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi (T0, T1, T2, T3) (T0, T1, T2, T3, T4) (T0, T1, T2, T3, T4, T5) - and 146 others + and 144 others note: required by a bound in `dropshot::Query` --> src/handler.rs | @@ -35,7 +35,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de> (T0, T1, T2) (T0, T1, T2, T3) (T0, T1, T2, T3, T4) - and 325 others + and 220 others = note: required because of the requirements on the impl of `serde::de::DeserializeOwned` for `QueryParams` note: required by a bound in `dropshot::Query` --> src/handler.rs diff --git a/dropshot/tests/fail/bad_endpoint5.stderr b/dropshot/tests/fail/bad_endpoint5.stderr index fd1687a01..581ee5384 100644 --- a/dropshot/tests/fail/bad_endpoint5.stderr +++ b/dropshot/tests/fail/bad_endpoint5.stderr @@ -13,7 +13,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de> (T0, T1, T2) (T0, T1, T2, T3) (T0, T1, T2, T3, T4) - and 325 others + and 220 others = note: required because of the requirements on the impl of `serde::de::DeserializeOwned` for `QueryParams` note: required by a bound in `dropshot::Query` --> src/handler.rs diff --git a/dropshot/tests/fail/bad_endpoint7.stderr b/dropshot/tests/fail/bad_endpoint7.stderr index 2d26e7681..eb4e973a7 100644 --- a/dropshot/tests/fail/bad_endpoint7.stderr +++ b/dropshot/tests/fail/bad_endpoint7.stderr @@ -13,7 +13,7 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied (T0, T1, T2, T3) (T0, T1, T2, T3, T4) (T0, T1, T2, T3, T4, T5) - and 223 others + and 219 others = note: required because of the requirements on the impl of `dropshot::handler::HttpResponseContent` for `Ret` note: required by a bound in `HttpResponseOk` --> src/handler.rs diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 31b25501e..a41a9d045 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -4,5 +4,5 @@ # The intent is to keep this updated as new stable versions are relased. [toolchain] -channel = "1.63.0" +channel = "1.64.0" profile = "default"