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

Merge branch 'master' into feat/immutable

This commit is contained in:
fakeshadow 2021-02-06 10:21:10 -08:00 committed by GitHub
parent 24228b89d0 20cf0094e5
commit 17e6ef44dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -15,11 +15,8 @@
in argument [#1905]
* `App::wrap_fn`, `Resource::wrap_fn` and `Scope::wrap_fn` would give `&Service` in closure
argument [#1905]
### Fixed
* Multiple calls `App::data` with the same type now keeps the latest call's data. [#1906]
* `web::block` accept any closure that has an output bound to `Send` and `'static`. [#1957]
### Fixed
* Multiple calls `App::data` with the same type now keeps the latest call's data. [#1906]

2
Cargo.toml
View File

@ -78,7 +78,7 @@ actix-macros = "0.2.0"
actix-router = "0.2.6"
actix-rt = "2"
actix-server = "2.0.0-beta.2"
actix-service = "2.0.0-beta.3"
actix-service = "=2.0.0-beta.3"
actix-utils = "3.0.0-beta.1"
actix-tls = { version = "3.0.0-beta.2", default-features = false, optional = true }