Update dependency rust to v1.85.0 (#1260)

oxidecomputer · Feb 28, 2025 · 7c6ed59 · 7c6ed59
1 parent b1593b9
commit 7c6ed59
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/dropshot/src/handler.rs b/dropshot/src/handler.rs
@@ -1045,7 +1045,7 @@ where
     T: HttpCodedResponse,
 {
     fn to_result(self) -> HttpHandlerResult {
-        self.into().map_err(Into::into)
+        self.into()
     }
     fn response_metadata() -> ApiEndpointResponse {
         ApiEndpointResponse {

diff --git a/dropshot/tests/fail/bad_trait_channel4.stderr b/dropshot/tests/fail/bad_trait_channel4.stderr
@@ -54,10 +54,10 @@ note: required by a bound in `dropshot::Query`
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
 
 error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:41:18
+  --> tests/fail/bad_trait_channel4.rs:16:1
    |
-41 |         _params: Query<QueryParams>,
-   |                  ^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
+16 | #[dropshot::api_description]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
    |
    = help: the following other types implement trait `schemars::JsonSchema`:
              &'a T
@@ -74,12 +74,13 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                                                ^^^^^^^^^^ required by this bound in `Query`
+   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:41:18
+  --> tests/fail/bad_trait_channel4.rs:16:1
    |
-41 |         _params: Query<QueryParams>,
-   |                  ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
+16 | #[dropshot::api_description]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 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
@@ -99,11 +100,12 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
+   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:26:18
+  --> tests/fail/bad_trait_channel4.rs:41:18
    |
-26 |         _params: Query<QueryParams>,
+41 |         _params: Query<QueryParams>,
    |                  ^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
    |
    = help: the following other types implement trait `schemars::JsonSchema`:
@@ -123,9 +125,9 @@ note: required by a bound in `dropshot::Query`
    |                                                ^^^^^^^^^^ required by this bound in `Query`
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:26:18
+  --> tests/fail/bad_trait_channel4.rs:41:18
    |
-26 |         _params: Query<QueryParams>,
+41 |         _params: Query<QueryParams>,
    |                  ^^^^^^^^^^^^^^^^^^ 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
@@ -148,10 +150,10 @@ note: required by a bound in `dropshot::Query`
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
 
 error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:16:1
+  --> tests/fail/bad_trait_channel4.rs:26:18
    |
-16 | #[dropshot::api_description]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
+26 |         _params: Query<QueryParams>,
+   |                  ^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
    |
    = help: the following other types implement trait `schemars::JsonSchema`:
              &'a T
@@ -168,13 +170,12 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                                                ^^^^^^^^^^ required by this bound in `Query`
-   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel4.rs:16:1
+  --> tests/fail/bad_trait_channel4.rs:26:18
    |
-16 | #[dropshot::api_description]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
+26 |         _params: Query<QueryParams>,
+   |                  ^^^^^^^^^^^^^^^^^^ 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
@@ -194,7 +195,6 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
-   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfied
   --> tests/fail/bad_trait_channel4.rs:20:5

diff --git a/dropshot/tests/fail/bad_trait_channel5.stderr b/dropshot/tests/fail/bad_trait_channel5.stderr
@@ -28,10 +28,10 @@ note: required by a bound in `dropshot::Query`
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel5.rs:41:18
+  --> tests/fail/bad_trait_channel5.rs:17:1
    |
-41 |         _params: Query<QueryParams>,
-   |                  ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
+17 | #[dropshot::api_description]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 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
@@ -51,11 +51,12 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
+   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel5.rs:27:18
+  --> tests/fail/bad_trait_channel5.rs:41:18
    |
-27 |         _params: Query<QueryParams>,
+41 |         _params: Query<QueryParams>,
    |                  ^^^^^^^^^^^^^^^^^^ 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
@@ -78,10 +79,10 @@ note: required by a bound in `dropshot::Query`
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
-  --> tests/fail/bad_trait_channel5.rs:17:1
+  --> tests/fail/bad_trait_channel5.rs:27:18
    |
-17 | #[dropshot::api_description]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `QueryParams`
+27 |         _params: Query<QueryParams>,
+   |                  ^^^^^^^^^^^^^^^^^^ 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
@@ -101,7 +102,6 @@ note: required by a bound in `dropshot::Query`
    |
    | pub struct Query<QueryType: DeserializeOwned + JsonSchema + Send + Sync> {
    |                             ^^^^^^^^^^^^^^^^ required by this bound in `Query`
-   = note: this error originates in the attribute macro `dropshot::api_description` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `for<'de> QueryParams: serde::de::Deserialize<'de>` is not satisfied
   --> tests/fail/bad_trait_channel5.rs:21:5

diff --git 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.84.1"
+channel = "1.85.0"
 profile = "default"