Update dependency rust to v1.84.0 (#1226)

* Update dependency rust to v1.84.0 * update errors --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Adam H. Leventhal <[email protected]>
oxidecomputer · Jan 15, 2025 · 484cc5c · 484cc5c
1 parent c4df6b2
commit 484cc5c
Show file tree

Hide file tree

Showing 37 changed files with 178 additions and 93 deletions.
diff --git a/dropshot/tests/fail/bad_channel15.stderr b/dropshot/tests/fail/bad_channel15.stderr
@@ -7,7 +7,7 @@ error: future cannot be sent between threads safely
 14 | | }]
    | |__^ future returned by `bad_channel` is not `Send`
    |
-   = help: within `impl Future<Output = Result<(), Box<(dyn std::error::Error + Send + Sync + 'static)>>>`, the trait `Send` is not implemented for `Rc<i32>`, which is required by `impl Future<Output = Result<(), Box<(dyn std::error::Error + Send + Sync + 'static)>>>: Send`
+   = help: within `impl Future<Output = Result<(), Box<(dyn std::error::Error + Send + Sync + 'static)>>>`, the trait `Send` is not implemented for `Rc<i32>`
 note: future is not `Send` as this value is used across an await
   --> tests/fail/bad_channel15.rs:20:50
    |
@@ -31,7 +31,7 @@ error: future cannot be sent between threads safely
 15 | async fn bad_channel(
    | ^^^^^ future created by async block is not `Send`
    |
-   = help: within `{async block@$DIR/tests/fail/bad_channel15.rs:15:1: 15:6}`, the trait `Send` is not implemented for `Rc<i32>`, which is required by `{async block@$DIR/tests/fail/bad_channel15.rs:15:1: 15:6}: Send`
+   = help: within `{async block@$DIR/tests/fail/bad_channel15.rs:15:1: 15:6}`, the trait `Send` is not implemented for `Rc<i32>`
 note: future is not `Send` as this value is used across an await
   --> tests/fail/bad_channel15.rs:20:50
    |

diff --git a/dropshot/tests/fail/bad_channel17.stderr b/dropshot/tests/fail/bad_channel17.stderr
@@ -29,8 +29,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, WebsocketConnection, Webso
 15 | | }]
    | |__- required by a bound introduced by this call
 16 |   async fn two_websocket_channels(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, WebsocketConnection, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {two_websocket_channels_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, WebsocketConnection, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {two_websocket_channels_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_channel18.stderr b/dropshot/tests/fail/bad_channel18.stderr
@@ -68,8 +68,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, WebsocketConnection, Webso
 22 | | }]
    | |__- required by a bound introduced by this call
 23 |   async fn websocket_channel_not_last(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, WebsocketConnection, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {websocket_channel_not_last_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, WebsocketConnection, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {websocket_channel_not_last_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_channel19.stderr b/dropshot/tests/fail/bad_channel19.stderr
@@ -29,8 +29,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, std::string::String, Webso
 22 | | }]
    | |__- required by a bound introduced by this call
 23 |   async fn non_extractor_as_last_argument(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, std::string::String, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {non_extractor_as_last_argument_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, std::string::String, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {non_extractor_as_last_argument_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_channel27.stderr b/dropshot/tests/fail/bad_channel27.stderr
@@ -14,7 +14,7 @@ error[E0277]: `<Self as MyTrait>::Context` cannot be sent between threads safely
 20 |         _rqctx: RequestContext<Self::Context>,
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `<Self as MyTrait>::Context` cannot be sent between threads safely
    |
-   = help: the trait `Send` is not implemented for `<Self as MyTrait>::Context`, which is required by `<Self as MyTrait>::Context: ServerContext`
+   = help: the trait `Send` is not implemented for `<Self as MyTrait>::Context`
    = note: required for `<Self as MyTrait>::Context` to implement `ServerContext`
 note: required by a bound in `RequestContext`
   --> src/handler.rs
@@ -32,7 +32,7 @@ error[E0277]: `<Self as MyTrait>::Context` cannot be shared between threads safe
 20 |         _rqctx: RequestContext<Self::Context>,
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `<Self as MyTrait>::Context` cannot be shared between threads safely
    |
-   = help: the trait `Sync` is not implemented for `<Self as MyTrait>::Context`, which is required by `<Self as MyTrait>::Context: ServerContext`
+   = help: the trait `Sync` is not implemented for `<Self as MyTrait>::Context`
    = note: required for `<Self as MyTrait>::Context` to implement `ServerContext`
 note: required by a bound in `RequestContext`
   --> src/handler.rs

diff --git a/dropshot/tests/fail/bad_channel4.stderr b/dropshot/tests/fail/bad_channel4.stderr
@@ -24,7 +24,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
   --> tests/fail/bad_channel4.rs:22:14
    |
 22 |     _params: Query<QueryParams>,
-   |              ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   |              ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -79,7 +79,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
 22 | |     _params: Query<QueryParams>,
 23 | |     _upgraded: WebsocketConnection,
 24 | | ) -> dropshot::WebsocketChannelResult {
-   | |_____________________________________^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   | |_____________________________________^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -133,7 +133,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
 17 | |     protocol = WEBSOCKETS,
 18 | |     path = "/test",
 19 | | }]
-   | |__^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   | |__^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -164,8 +164,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, dropshot::Query<QueryParam
 19 | | }]
    | |__- required by a bound introduced by this call
 20 |   async fn bad_channel(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_channel5.stderr b/dropshot/tests/fail/bad_channel5.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
   --> tests/fail/bad_channel5.rs:24:14
    |
 24 |     _params: Query<QueryParams>,
-   |              ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   |              ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -31,7 +31,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
 24 | |     _params: Query<QueryParams>,
 25 | |     _upgraded: WebsocketConnection,
 26 | | ) -> dropshot::WebsocketChannelResult {
-   | |_____________________________________^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   | |_____________________________________^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -59,7 +59,7 @@ error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>
 19 | |     protocol = WEBSOCKETS,
 20 | |     path = "/test",
 21 | | }]
-   | |__^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`, which is required by `QueryParams: serde::de::DeserializeOwned`
+   | |__^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
    |
    = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
    = note: for types from other crates check whether the crate offers a `serde` feature flag
@@ -90,8 +90,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, dropshot::Query<QueryParam
 21 | | }]
    | |__- required by a bound introduced by this call
 22 |   async fn bad_channel(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_channel9.stderr b/dropshot/tests/fail/bad_channel9.stderr
@@ -27,8 +27,9 @@ error[E0277]: the trait bound `fn(dropshot::Query<QueryParams>, WebsocketUpgrade
 22 | | }]
    | |__- required by a bound introduced by this call
 23 |   async fn bad_channel(
-   |   ^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
+   |   ^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(dropshot::Query<QueryParams>, WebsocketUpgrade) -> impl Future<Output = Result<http::response::Response<Body>, HttpError>> {bad_channel_adapter}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_endpoint10.stderr b/dropshot/tests/fail/bad_endpoint10.stderr
@@ -28,8 +28,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>) -> impl Future<Output = Re
 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 item `fn(RequestContext<()>) -> impl Future<Output = Result<HttpResponseOk<()>, String>> {<impl std::convert::From<bad_error_type> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_error_type}`
+   |            ^^^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>) -> impl Future<Output = Result<HttpResponseOk<()>, String>> {<impl std::convert::From<bad_error_type> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_error_type}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_endpoint12.stderr b/dropshot/tests/fail/bad_endpoint12.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `String: HttpResponse` is not satisfied
   --> tests/fail/bad_endpoint12.rs:15:6
    |
 15 | ) -> Result<String, HttpError> {
-   |      ^^^^^^ the trait `HttpCodedResponse` is not implemented for `String`, which is required by `String: HttpResponse`
+   |      ^^^^^^ the trait `HttpCodedResponse` is not implemented for `String`
    |
    = help: the following other types implement trait `HttpCodedResponse`:
              HttpResponseAccepted<T>
@@ -36,8 +36,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>) -> impl Future<Output = Re
 12 | | }]
    | |__- required by a bound introduced by this call
 13 |   async fn bad_response_type(
-   |            ^^^^^^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>) -> impl Future<Output = Result<String, HttpError>> {<impl std::convert::From<bad_response_type> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_response_type}`
+   |            ^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>) -> impl Future<Output = Result<String, HttpError>> {<impl std::convert::From<bad_response_type> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_response_type}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_endpoint15.stderr b/dropshot/tests/fail/bad_endpoint15.stderr
@@ -7,8 +7,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>) -> impl Future<Output = Re
 16 | | }]
    | |__- required by a bound introduced by this call
 17 |   async fn bad_endpoint(
-   |            ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>) -> impl Future<Output = Result<HttpResponseOk<i32>, HttpError>> {<impl std::convert::From<bad_endpoint> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_endpoint}`
+   |            ^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>) -> impl Future<Output = Result<HttpResponseOk<i32>, HttpError>> {<impl std::convert::From<bad_endpoint> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::bad_endpoint}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |
@@ -27,7 +28,7 @@ error: future cannot be sent between threads safely
 16 | | }]
    | |__^ future returned by `bad_endpoint` is not `Send`
    |
-   = help: within `impl Future<Output = Result<HttpResponseOk<i32>, HttpError>>`, the trait `Send` is not implemented for `Rc<i32>`, which is required by `impl Future<Output = Result<HttpResponseOk<i32>, HttpError>>: Send`
+   = help: within `impl Future<Output = Result<HttpResponseOk<i32>, HttpError>>`, the trait `Send` is not implemented for `Rc<i32>`
 note: future is not `Send` as this value is used across an await
   --> tests/fail/bad_endpoint15.rs:21:50
    |

diff --git a/dropshot/tests/fail/bad_endpoint17.stderr b/dropshot/tests/fail/bad_endpoint17.stderr
@@ -29,8 +29,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, TypedBody<Stuff>, UntypedB
 27 | | }]
    | |__- required by a bound introduced by this call
 28 |   async fn two_exclusive_extractors(
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, TypedBody<Stuff>, UntypedBody) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<two_exclusive_extractors> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::two_exclusive_extractors}`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, TypedBody<Stuff>, UntypedBody) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<two_exclusive_extractors> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::two_exclusive_extractors}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_endpoint18.stderr b/dropshot/tests/fail/bad_endpoint18.stderr
@@ -29,8 +29,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, TypedBody<Stuff>, dropshot
 24 | | }]
    | |__- required by a bound introduced by this call
 25 |   async fn exclusive_extractor_not_last(
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, TypedBody<Stuff>, dropshot::Query<Stuff>) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<exclusive_extractor_not_last> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::exclusive_extractor_not_last}`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, TypedBody<Stuff>, dropshot::Query<Stuff>) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<exclusive_extractor_not_last> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::exclusive_extractor_not_last}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |

diff --git a/dropshot/tests/fail/bad_endpoint19.stderr b/dropshot/tests/fail/bad_endpoint19.stderr
@@ -29,8 +29,9 @@ error[E0277]: the trait bound `fn(RequestContext<()>, std::string::String, drops
 23 | | }]
    | |__- required by a bound introduced by this call
 24 |   async fn non_extractor_as_last_argument(
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, std::string::String, dropshot::Query<QueryParams>) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<non_extractor_as_last_argument> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::non_extractor_as_last_argument}`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
    |
+   = help: the trait `dropshot::handler::HttpHandlerFunc<_, _, _>` is not implemented for fn item `fn(RequestContext<()>, std::string::String, dropshot::Query<QueryParams>) -> impl Future<Output = Result<HttpResponseOk<()>, HttpError>> {<impl std::convert::From<non_extractor_as_last_argument> for ApiEndpoint<<RequestContext<()> as RequestContextArgument>::Context>>::from::non_extractor_as_last_argument}`
 note: required by a bound in `ApiEndpoint::<Context>::new`
   --> src/api_description.rs
    |