mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-09-30 15:22:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1494 from JohnTitor/new-actors

Browse source 
actors: Bump up to 3.0.0-alpha.1
This commit is contained in:
Yuki Okushi 2020-05-08 06:17:15 +09:00 committed by GitHub
commit 574714d156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actix-web-actors/CHANGES.md
View file

@ -1,5 +1,11 @@
# Changes # 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 ## [2.0.0] - 2019-12-20
* Release * Release

6
actix-web-actors/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web-actors" name = "actix-web-actors"
version = "2.0.0" version = "3.0.0-alpha.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix actors support for actix web framework." description = "Actix actors support for actix web framework."
readme = "README.md" readme = "README.md"
@ -16,7 +16,7 @@ name = "actix_web_actors"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
actix = "0.10.0-alpha.1" actix = "0.10.0-alpha.2"
actix-web = "3.0.0-alpha.1" actix-web = "3.0.0-alpha.1"
actix-http = "2.0.0-alpha.3" actix-http = "2.0.0-alpha.3"
actix-codec = "0.2.0" actix-codec = "0.2.0"
@ -26,4 +26,4 @@ pin-project = "0.4.6"
[dev-dependencies] [dev-dependencies]
actix-rt = "1.0.0" actix-rt = "1.0.0"
env_logger = "0.6" env_logger = "0.7"

2
actix-web-actors/src/context.rs
View file

@ -174,7 +174,7 @@ where
// frames // frames
if let Some(data) = self.fut.ctx().stream.pop_front() { 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() { } else if self.fut.alive() {
Poll::Pending Poll::Pending
} else { } else {