berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into fix_accept-encoding_header_without_compress_feature

This commit is contained in:
Rob Ede 2020-10-24 20:31:31 +01:00 committed by GitHub
parent 45ab39064c 41e7cec72f
commit 70519f90f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -7,10 +7,12 @@
### Changed ### Changed
* Print non-configured `Data<T>` type when attempting extraction. [#1743] * Print non-configured `Data<T>` type when attempting extraction. [#1743]
* Re-export bytes::Buf{Mut} in web module. [#1750]
[#1723]: https://github.com/actix/actix-web/pull/1723 [#1723]: https://github.com/actix/actix-web/pull/1723
[#1743]: https://github.com/actix/actix-web/pull/1743 [#1743]: https://github.com/actix/actix-web/pull/1743
[#1748]: https://github.com/actix/actix-web/pull/1748 [#1748]: https://github.com/actix/actix-web/pull/1748
[#1750]: https://github.com/actix/actix-web/pull/1750
## 3.1.0 - 2020-09-29 ## 3.1.0 - 2020-09-29

2
src/web.rs
View File

@ -4,7 +4,7 @@ use actix_router::IntoPattern;
use std::future::Future; use std::future::Future;
pub use actix_http::Response as HttpResponse; pub use actix_http::Response as HttpResponse;
pub use bytes::{Bytes, BytesMut}; pub use bytes::{Buf, BufMut, Bytes, BytesMut};
pub use futures_channel::oneshot::Canceled; pub use futures_channel::oneshot::Canceled;
use crate::error::BlockingError; use crate::error::BlockingError;