Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency rust to v1.85.0 #1260

Merged
merged 3 commits into from
Feb 28, 2025
Merged

Update dependency rust to v1.85.0 #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5da1d56
Update dependency rust to v1.85.0
renovate[bot] Feb 21, 2025
cf9df7b
update fixtures
ahl Feb 26, 2025
8d85be4
I for one welcome our clippy overlord
ahl Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dropshot/src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
36 changes: 18 additions & 18 deletions dropshot/tests/fail/bad_trait_channel4.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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`:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions dropshot/tests/fail/bad_trait_channel5.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading