mirror of
https://github.com/actix/actix-web.git
synced 2024-12-20 15:17:07 +00:00
rollback missed dependencies and CHANGES in crates except actix-http
This commit is contained in:
parent
d9c415e540
commit
835a00599c
9 changed files with 12 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
|||
# Changes
|
||||
|
||||
|
||||
## [2.1.NEXT] - 2020-01-xx
|
||||
## [2.0.NEXT] - 2020-01-xx
|
||||
|
||||
### Added
|
||||
|
||||
|
@ -15,8 +15,6 @@
|
|||
|
||||
* Update the `time` dependency to 0.2.7
|
||||
|
||||
* Accomodate breaking change in actix-http: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
|
||||
|
||||
## [2.0.0] - 2019-12-25
|
||||
|
||||
### Changed
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "actix-web"
|
||||
version = "3.0.0"
|
||||
version = "2.0.0"
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
|
||||
description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
|
||||
readme = "README.md"
|
||||
|
|
|
@ -16,7 +16,7 @@ name = "actix_identity"
|
|||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
actix-web = { version = "3.0.0", path = "..", default-features = false, features = ["secure-cookies"] }
|
||||
actix-web = { version = "2.0.0", default-features = false, features = ["secure-cookies"] }
|
||||
actix-service = "1.0.5"
|
||||
futures = "0.3.1"
|
||||
serde = "1.0"
|
||||
|
@ -25,5 +25,5 @@ time = { version = "0.2.5", default-features = false, features = ["std"] }
|
|||
|
||||
[dev-dependencies]
|
||||
actix-rt = "1.0.0"
|
||||
actix-http = { version = "2.0.0", path = "../actix-http" }
|
||||
actix-http = { version = "1.0.1" }
|
||||
bytes = "0.5.4"
|
||||
|
|
|
@ -22,7 +22,7 @@ default = ["cookie-session"]
|
|||
cookie-session = ["actix-web/secure-cookies"]
|
||||
|
||||
[dependencies]
|
||||
actix-web = { version = "3.0.0", path = ".." }
|
||||
actix-web = { version = "2.0.0" }
|
||||
actix-service = "1.0.5"
|
||||
bytes = "0.5.4"
|
||||
derive_more = "0.99.2"
|
||||
|
|
|
@ -4,8 +4,6 @@
|
|||
|
||||
* Fix compilation with default features off
|
||||
|
||||
* Accomodate breaking change: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
|
||||
|
||||
## [1.0.0] - 2019-12-13
|
||||
|
||||
* Release
|
||||
|
|
|
@ -1163,6 +1163,10 @@ mod tests {
|
|||
}
|
||||
|
||||
/*
|
||||
|
||||
Comment out until actix decoupled of actix-http:
|
||||
https://github.com/actix/actix/issues/321
|
||||
|
||||
use futures::FutureExt;
|
||||
|
||||
#[actix_rt::test]
|
||||
|
|
|
@ -4,9 +4,6 @@
|
|||
|
||||
* Update the `time` dependency to 0.2.7
|
||||
|
||||
* Breaking change: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
|
||||
|
||||
|
||||
## [1.0.0] - 2019-12-13
|
||||
|
||||
### Changed
|
||||
|
|
|
@ -55,5 +55,5 @@ time = { version = "0.2.7", default-features = false, features = ["std"] }
|
|||
open-ssl = { version="0.10", package="openssl", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
actix-web = { version = "3.0.0", path = ".." }
|
||||
actix-http = { version = "2.0.0", path = "../actix-http" }
|
||||
actix-web = { version = "2.0.0" }
|
||||
actix-http = { version = "1.0.1" }
|
||||
|
|
|
@ -27,4 +27,4 @@ fn weird_poll() {
|
|||
let _ = std::mem::replace(&mut body_stream, Err([0; 32])).unwrap().poll_next(&mut context);
|
||||
}
|
||||
|
||||
*/
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue