mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-20 23:26:44 +00:00
Code Issues Projects Releases Wiki Activity

use actix 0.5 release

Browse source
This commit is contained in:
Nikolay Kim 2018-02-17 13:33:38 -08:00
parent 3e3d3279b8
commit 0da382a7a4
14 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -78,8 +78,7 @@ openssl = { version="0.10", optional = true }
tokio-openssl = { version="0.2", optional = true } tokio-openssl = { version="0.2", optional = true }
[dependencies.actix] [dependencies.actix]
#version = "0.5" version = "0.5"
git = "https://github.com/actix/actix.git"
[dev-dependencies] [dev-dependencies]
env_logger = "0.5" env_logger = "0.5"

2
examples/basics/Cargo.toml
View file

@ -7,5 +7,5 @@ workspace = "../.."
[dependencies] [dependencies]
futures = "*" futures = "*"
env_logger = "0.5" env_logger = "0.5"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path="../.." } actix-web = { path="../.." }

2
examples/diesel/Cargo.toml
View file

@ -6,7 +6,7 @@ workspace = "../.."
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
actix = { git = "https://github.com/actix/actix.git/" } actix = "0.5"
actix-web = { path = "../../" } actix-web = { path = "../../" }
futures = "0.1" futures = "0.1"

2
examples/hello-world/Cargo.toml
View file

@ -6,5 +6,5 @@ workspace = "../.."
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path = "../../" } actix-web = { path = "../../" }

2
examples/json/Cargo.toml
View file

@ -14,5 +14,5 @@ serde_json = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
json = "*" json = "*"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path="../../" } actix-web = { path="../../" }

2
examples/multipart/Cargo.toml
View file

@ -11,5 +11,5 @@ path = "src/main.rs"
[dependencies] [dependencies]
env_logger = "*" env_logger = "*"
futures = "0.1" futures = "0.1"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path="../../" } actix-web = { path="../../" }

2
examples/r2d2/Cargo.toml
View file

@ -6,7 +6,7 @@ workspace = "../.."
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
actix = { git = "https://github.com/actix/actix.git/" } actix = "0.5"
actix-web = { path = "../../" } actix-web = { path = "../../" }
futures = "0.1" futures = "0.1"

3
examples/state/Cargo.toml
View file

@ -7,6 +7,5 @@ workspace = "../.."
[dependencies] [dependencies]
futures = "*" futures = "*"
env_logger = "0.5" env_logger = "0.5"
#actix = "0.4.6" actix = "0.5"
actix = {git = "https://github.com/actix/actix.git"}
actix-web = { path = "../../" } actix-web = { path = "../../" }

2
examples/template_tera/Cargo.toml
View file

@ -6,6 +6,6 @@ workspace = "../.."
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
actix = "0.4" actix = "0.5"
actix-web = { path = "../../" } actix-web = { path = "../../" }
tera = "*" tera = "*"

2
examples/tls/Cargo.toml
View file

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path = "../../", features=["alpn"] } actix-web = { path = "../../", features=["alpn"] }
openssl = { version="0.10" } openssl = { version="0.10" }

2
examples/web-cors/backend/Cargo.toml
View file

@ -10,7 +10,7 @@ serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
http = "0.1" http = "0.1"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path = "../../../" } actix-web = { path = "../../../" }
dotenv = "0.10" dotenv = "0.10"
env_logger = "0.5" env_logger = "0.5"

2
examples/websocket-chat/Cargo.toml
View file

@ -25,5 +25,5 @@ serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
actix = { git="https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path="../../" } actix-web = { path="../../" }

3
examples/websocket/Cargo.toml
View file

@ -16,6 +16,5 @@ path = "src/client.rs"
env_logger = "*" env_logger = "*"
futures = "0.1" futures = "0.1"
tokio-core = "0.1" tokio-core = "0.1"
#actix = "^0.4.6" actix = "0.5"
actix = { git = "https://github.com/actix/actix.git" }
actix-web = { path="../../" } actix-web = { path="../../" }

4
guide/src/qs_14.md
View file

@ -72,7 +72,7 @@ can access it.
```rust,ignore ```rust,ignore
/// This is state where we will store *DbExecutor* address. /// This is state where we will store *DbExecutor* address.
struct State { struct State {
db: SyncAddress<DbExecutor>, db: Addr<Syn, DbExecutor>,
} }
fn main() { fn main() {
@ -106,7 +106,7 @@ fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>>
let name = &req.match_info()["name"]; let name = &req.match_info()["name"];
// Send message to `DbExecutor` actor // Send message to `DbExecutor` actor
req.state().db.call_fut(CreateUser{name: name.to_owned()}) req.state().db.send(CreateUser{name: name.to_owned()})
.from_err() .from_err()
.and_then(|res| { .and_then(|res| {
match res { match res {