diff --git a/Cargo.toml b/Cargo.toml index 10a045739..baef790dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,8 +38,8 @@ tokio-core = "0.1" redis-async = "0.0" # actix web session -actix-web = { version="0.4", optional=true } -# actix-web = { git = "https://github.com/actix/actix-web.git", optional=true } +# actix-web = { version="0.4", optional=true } +actix-web = { git = "https://github.com/actix/actix-web.git", optional=true } cookie = { version="0.10", features=["percent-encode", "secure"], optional=true } http = { version="0.1", optional=true } rand = { version="0.3", optional=true } diff --git a/examples/basic.rs b/examples/basic.rs index e7e5874bd..87e0049c8 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -7,7 +7,7 @@ extern crate actix_redis; extern crate env_logger; extern crate futures; -use actix_web::*; +use actix_web::{server, middleware, App, HttpRequest, HttpResponse, Result}; use actix_web::middleware::RequestSession; use actix_redis::RedisSessionBackend; @@ -32,8 +32,8 @@ fn main() { env_logger::init(); let sys = actix::System::new("basic-example"); - HttpServer::new( - || Application::new() + server::new( + || App::new() // enable logger .middleware(middleware::Logger::default()) // cookie session middleware