oxidecomputer · ahl · Sep 28, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git 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<String, HttpError> {
    |      ^^^^^^ the trait `HttpCodedResponse` is not implemented for `String`, which is required by `Result<String, HttpError>: ResultTrait`
    |
-   = help: the following other types implement trait `HttpResponse`:
-             HttpResponseHeaders<T, H>
-             http::response::Response<Body>
+   = help: the following other types implement trait `HttpCodedResponse`:
+             HttpResponseAccepted<T>
+             HttpResponseCreated<T>
+             HttpResponseDeleted
+             HttpResponseOk<T>
+             HttpResponseUpdatedNoContent
+             dropshot::handler::HttpResponseFoundStatus
+             dropshot::handler::HttpResponseSeeOtherStatus
+             dropshot::handler::HttpResponseTemporaryRedirectStatus
    = note: required for `String` to implement `HttpResponse`
 note: required for `Result<String, HttpError>` 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
@@ -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<BodyType>
-             UntypedBody
-             WebsocketUpgrade
+   = help: the following other types implement trait `SharedExtractor`:
+             dropshot::Path<PathType>
+             dropshot::Query<QueryType>
    = 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
@@ -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<HttpResponseOk<Ret>, HttpError> {
-   |      ^^^^^^ the trait `serde::ser::Serialize` is not implemented for `Ret`, which is required by `Result<HttpResponseOk<Ret>, 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<Ret>` to implement `HttpCodedResponse`
-   = note: required for `HttpResponseOk<Ret>` to implement `HttpResponse`
-note: required for `Result<HttpResponseOk<Ret>, 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<HttpResponseOk<Ret>, HttpError> {
-   |        ^^^^^^
+   | pub struct HttpResponseOk<T: HttpResponseContent + Send + Sync + 'static>(
+   |                              ^^^^^^^^^^^^^^^^^^^ 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
@@ -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
@@ -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
@@ -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<HttpResponseOk<Ret>, 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
@@ -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;
    |

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.80.0"
+channel = "1.81.0"
 profile = "default"