From 54542ca3b8b5dae38959a39122d32b52276f82a1 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 17 May 2021 15:32:58 +0100 Subject: [PATCH] update changelog --- CHANGES.md | 2 ++ actix-http/CHANGES.md | 3 +++ actix-http/src/response_builder.rs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 162f9f61b..28dfb093e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,12 +10,14 @@ * Update `language-tags` to `0.3`. * `ServiceResponse::take_body`. [#2201] * `ServiceResponse::map_body` closure receives and returns `B` instead of `ResponseBody` types. [#2201] +* All error trait bounds in server service builders have changed from `Into` to `Into>`. [#2224] ### Removed * `HttpResponse::take_body` and old `HttpResponse::into_body` method that casted body type. [#2201] [#2200]: https://github.com/actix/actix-web/pull/2200 [#2201]: https://github.com/actix/actix-web/pull/2201 +[#2224]: https://github.com/actix/actix-web/pull/2224 ## 4.0.0-beta.6 - 2021-04-17 diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index ec7d8ee3b..f3d0aab45 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -12,12 +12,14 @@ ### Changed * The `MessageBody` trait now has an associated `Error` type. [#2183] +* All error trait bounds in server service builders have changed from `Into` to `Into>`. [#2224] * Places in `Response` where `ResponseBody` was received or returned now simply use `B`. [#2201] * `header` mod is now public. [#2171] * `uri` mod is now public. [#2171] * Update `language-tags` to `0.3`. * Reduce the level from `error` to `debug` for the log line that is emitted when a `500 Internal Server Error` is built using `HttpResponse::from_error`. [#2201] * `ResponseBuilder::message_body` now returns a `Result`. [#2201] +* Remove `Unpin` bound on `ResponseBuilder::streaming`. [#2224] ### Removed * Stop re-exporting `http` crate's `HeaderMap` types in addition to ours. [#2171] @@ -35,6 +37,7 @@ [#2201]: https://github.com/actix/actix-web/pull/2201 [#2205]: https://github.com/actix/actix-web/pull/2205 [#2215]: https://github.com/actix/actix-web/pull/2215 +[#2224]: https://github.com/actix/actix-web/pull/2224 ## 3.0.0-beta.6 - 2021-04-17 diff --git a/actix-http/src/response_builder.rs b/actix-http/src/response_builder.rs index df9079d70..f4b76382b 100644 --- a/actix-http/src/response_builder.rs +++ b/actix-http/src/response_builder.rs @@ -258,7 +258,7 @@ impl ResponseBuilder { #[inline] pub fn streaming(&mut self, stream: S) -> Response where - S: Stream> + Unpin + 'static, + S: Stream> + 'static, E: Into + 'static, { self.body(Body::from_message(BodyStream::new(stream)))