From dc93bbd8741460fcccd4e8cf101ceef8c0813ff8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 03:39:29 +0000 Subject: [PATCH 1/2] Update dependency rust to v1.81.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 754673c7..b11c90ad 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.80.0" +channel = "1.81.0" profile = "default" From 749aa50f87817b73e441e6b703ccc06579cb7a62 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Thu, 26 Sep 2024 12:01:55 -0700 Subject: [PATCH 2/2] update fixtures --- dropshot/tests/fail/bad_endpoint12.stderr | 12 +++++-- dropshot/tests/fail/bad_endpoint3.stderr | 10 ++---- dropshot/tests/fail/bad_endpoint7.stderr | 31 +++++++++---------- .../tests/fail/bad_trait_channel21.stderr | 4 +-- .../tests/fail/bad_trait_endpoint21.stderr | 4 +-- .../tests/fail/bad_trait_endpoint7.stderr | 26 ++++++++++++---- dropshot/tests/fail/bad_trait_only13.stderr | 4 +-- 7 files changed, 53 insertions(+), 38 deletions(-) diff --git a/dropshot/tests/fail/bad_endpoint12.stderr b/dropshot/tests/fail/bad_endpoint12.stderr index aa8cd228..9e47406d 100644 --- a/dropshot/tests/fail/bad_endpoint12.stderr +++ b/dropshot/tests/fail/bad_endpoint12.stderr @@ -4,9 +4,15 @@ error[E0277]: the trait bound `String: HttpResponse` is not satisfied 15 | ) -> Result { | ^^^^^^ the trait `HttpCodedResponse` is not implemented for `String`, which is required by `Result: ResultTrait` | - = help: the following other types implement trait `HttpResponse`: - HttpResponseHeaders - http::response::Response + = help: the following other types implement trait `HttpCodedResponse`: + HttpResponseAccepted + HttpResponseCreated + HttpResponseDeleted + HttpResponseOk + HttpResponseUpdatedNoContent + dropshot::handler::HttpResponseFoundStatus + dropshot::handler::HttpResponseSeeOtherStatus + dropshot::handler::HttpResponseTemporaryRedirectStatus = note: required for `String` to implement `HttpResponse` note: required for `Result` to implement `ResultTrait` --> tests/fail/bad_endpoint12.rs:15:6 diff --git a/dropshot/tests/fail/bad_endpoint3.stderr b/dropshot/tests/fail/bad_endpoint3.stderr index d4df7a6e..541edbd5 100644 --- a/dropshot/tests/fail/bad_endpoint3.stderr +++ b/dropshot/tests/fail/bad_endpoint3.stderr @@ -4,13 +4,9 @@ error[E0277]: the trait bound `String: ExclusiveExtractor` is not satisfied 18 | _param: String, | ^^^^^^ the trait `SharedExtractor` is not implemented for `String`, which is required by `String: ExclusiveExtractor` | - = help: the following other types implement trait `ExclusiveExtractor`: - MultipartBody - RawRequest - StreamingBody - TypedBody - UntypedBody - WebsocketUpgrade + = help: the following other types implement trait `SharedExtractor`: + dropshot::Path + dropshot::Query = note: required for `String` to implement `ExclusiveExtractor` note: required by a bound in `need_exclusive_extractor` --> tests/fail/bad_endpoint3.rs:12:1 diff --git a/dropshot/tests/fail/bad_endpoint7.stderr b/dropshot/tests/fail/bad_endpoint7.stderr index 8decd867..eb251422 100644 --- a/dropshot/tests/fail/bad_endpoint7.stderr +++ b/dropshot/tests/fail/bad_endpoint7.stderr @@ -2,7 +2,7 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied --> tests/fail/bad_endpoint7.rs:24:6 | 24 | ) -> Result, HttpError> { - | ^^^^^^ the trait `serde::ser::Serialize` is not implemented for `Ret`, which is required by `Result, HttpError>: ResultTrait` + | ^^^^^^ the trait `serde::ser::Serialize` is not implemented for `Ret`, which is required by `Ret: dropshot::handler::HttpResponseContent` | = note: for local types consider adding `#[derive(serde::Serialize)]` to your `Ret` type = note: for types from other crates check whether the crate offers a `serde` feature flag @@ -17,19 +17,11 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied (T0, T1, T2, T3, T4) and $N others = note: required for `Ret` to implement `dropshot::handler::HttpResponseContent` - = note: required for `HttpResponseOk` to implement `HttpCodedResponse` - = note: required for `HttpResponseOk` to implement `HttpResponse` -note: required for `Result, HttpError>` to implement `ResultTrait` - --> tests/fail/bad_endpoint7.rs:24:6 +note: required by a bound in `HttpResponseOk` + --> src/handler.rs | -18 | / #[endpoint { -19 | | method = GET, -20 | | path = "/test", -21 | | }] - | |__- unsatisfied trait bound introduced here -... -24 | ) -> Result, HttpError> { - | ^^^^^^ + | pub struct HttpResponseOk( + | ^^^^^^^^^^^^^^^^^^^ required by this bound in `HttpResponseOk` error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied --> tests/fail/bad_endpoint7.rs:24:13 @@ -68,9 +60,16 @@ error[E0277]: the trait bound `Ret: dropshot::handler::HttpResponseContent` is n 28 | | })) | |_____^ the trait `serde::ser::Serialize` is not implemented for `Ret`, which is required by `Ret: dropshot::handler::HttpResponseContent` | - = help: the following other types implement trait `dropshot::handler::HttpResponseContent`: - FreeformBody - dropshot::handler::Empty + = help: the following other types implement trait `serde::ser::Serialize`: + &'a T + &'a mut T + () + (T,) + (T0, T1) + (T0, T1, T2) + (T0, T1, T2, T3) + (T0, T1, T2, T3, T4) + and $N others = note: required for `Ret` to implement `dropshot::handler::HttpResponseContent` note: required by a bound in `HttpResponseOk` --> src/handler.rs diff --git a/dropshot/tests/fail/bad_trait_channel21.stderr b/dropshot/tests/fail/bad_trait_channel21.stderr index f6e1d1c8..caf9c644 100644 --- a/dropshot/tests/fail/bad_trait_channel21.stderr +++ b/dropshot/tests/fail/bad_trait_channel21.stderr @@ -16,13 +16,13 @@ error: endpoint `variadic_argument` must not have a variadic argument 32 | ... | ^^^ -error: only foreign or `unsafe extern "C"` functions may be C-variadic +error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg --> tests/fail/bad_trait_channel21.rs:32:9 | 32 | ... | ^^^ -error: only foreign or `unsafe extern "C"` functions may be C-variadic +error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg --> tests/fail/bad_trait_channel21.rs:45:9 | 45 | ... diff --git a/dropshot/tests/fail/bad_trait_endpoint21.stderr b/dropshot/tests/fail/bad_trait_endpoint21.stderr index 376530ac..71639da2 100644 --- a/dropshot/tests/fail/bad_trait_endpoint21.stderr +++ b/dropshot/tests/fail/bad_trait_endpoint21.stderr @@ -19,13 +19,13 @@ error: endpoint `variadic_argument` must not have a variadic argument 33 | ... | ^^^ -error: only foreign or `unsafe extern "C"` functions may be C-variadic +error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg --> tests/fail/bad_trait_endpoint21.rs:33:9 | 33 | ... | ^^^ -error: only foreign or `unsafe extern "C"` functions may be C-variadic +error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg --> tests/fail/bad_trait_endpoint21.rs:46:9 | 46 | ... diff --git a/dropshot/tests/fail/bad_trait_endpoint7.stderr b/dropshot/tests/fail/bad_trait_endpoint7.stderr index 3bdeae9d..9a82831f 100644 --- a/dropshot/tests/fail/bad_trait_endpoint7.stderr +++ b/dropshot/tests/fail/bad_trait_endpoint7.stderr @@ -6,9 +6,16 @@ error[E0277]: the trait bound `Ret: dropshot::handler::HttpResponseContent` is n | | | required by a bound introduced by this call | - = help: the following other types implement trait `dropshot::handler::HttpResponseContent`: - FreeformBody - dropshot::handler::Empty + = help: the following other types implement trait `serde::ser::Serialize`: + &'a T + &'a mut T + () + (T,) + (T0, T1) + (T0, T1, T2) + (T0, T1, T2, T3) + (T0, T1, T2, T3, T4) + and $N others = note: required for `Ret` to implement `dropshot::handler::HttpResponseContent` note: required by a bound in `dropshot::HttpResponseOk` --> src/handler.rs @@ -99,9 +106,16 @@ error[E0277]: the trait bound `Ret: dropshot::handler::HttpResponseContent` is n 28 | ) -> Result, HttpError>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `serde::ser::Serialize` is not implemented for `Ret`, which is required by `Ret: dropshot::handler::HttpResponseContent` | - = help: the following other types implement trait `dropshot::handler::HttpResponseContent`: - FreeformBody - dropshot::handler::Empty + = help: the following other types implement trait `serde::ser::Serialize`: + &'a T + &'a mut T + () + (T,) + (T0, T1) + (T0, T1, T2) + (T0, T1, T2, T3) + (T0, T1, T2, T3, T4) + and $N others = note: required for `Ret` to implement `dropshot::handler::HttpResponseContent` note: required by a bound in `dropshot::HttpResponseOk` --> src/handler.rs diff --git a/dropshot/tests/fail/bad_trait_only13.stderr b/dropshot/tests/fail/bad_trait_only13.stderr index 618721be..cbf4dce8 100644 --- a/dropshot/tests/fail/bad_trait_only13.stderr +++ b/dropshot/tests/fail/bad_trait_only13.stderr @@ -20,7 +20,7 @@ error: cannot find attribute `endpoint` in this scope 21 | #[endpoint { | ^^^^^^^^ | -help: consider importing one of these items +help: consider importing one of these attribute macros | 5 + use dropshot::endpoint; | @@ -33,7 +33,7 @@ error: cannot find attribute `channel` in this scope 29 | #[channel { | ^^^^^^^ | -help: consider importing one of these items +help: consider importing one of these attribute macros | 5 + use dropshot::channel; |