mirror of
https://github.com/actix/actix-web.git
synced 2024-11-18 07:35:36 +00:00
Merge pull request #1494 from JohnTitor/new-actors
actors: Bump up to 3.0.0-alpha.1
This commit is contained in:
commit
574714d156
3 changed files with 10 additions and 4 deletions
|
@ -1,5 +1,11 @@
|
|||
# Changes
|
||||
|
||||
# [3.0.0-alpha.1] - 2020-05-08
|
||||
|
||||
* Update the actix-web dependency to 3.0.0-alpha.1
|
||||
* Update the actix dependency to 0.10.0-alpha.2
|
||||
* Update the actix-http dependency to 2.0.0-alpha.3
|
||||
|
||||
## [2.0.0] - 2019-12-20
|
||||
|
||||
* Release
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "actix-web-actors"
|
||||
version = "2.0.0"
|
||||
version = "3.0.0-alpha.1"
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
|
||||
description = "Actix actors support for actix web framework."
|
||||
readme = "README.md"
|
||||
|
@ -16,7 +16,7 @@ name = "actix_web_actors"
|
|||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
actix = "0.10.0-alpha.1"
|
||||
actix = "0.10.0-alpha.2"
|
||||
actix-web = "3.0.0-alpha.1"
|
||||
actix-http = "2.0.0-alpha.3"
|
||||
actix-codec = "0.2.0"
|
||||
|
@ -26,4 +26,4 @@ pin-project = "0.4.6"
|
|||
|
||||
[dev-dependencies]
|
||||
actix-rt = "1.0.0"
|
||||
env_logger = "0.6"
|
||||
env_logger = "0.7"
|
||||
|
|
|
@ -174,7 +174,7 @@ where
|
|||
|
||||
// frames
|
||||
if let Some(data) = self.fut.ctx().stream.pop_front() {
|
||||
Poll::Ready(data.map(|b| Ok(b)))
|
||||
Poll::Ready(data.map(Ok))
|
||||
} else if self.fut.alive() {
|
||||
Poll::Pending
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue