diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index 377a58737d..127ea9ae1a 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -1,15 +1,22 @@ # Changes +## [0.3.0] - 2019-03-02 + +### Changed + +* Use new `NewService` trait + + ## [0.2.1] - 2019-02-09 -### Changes +### Changed * Drop service response ## [0.2.0] - 2019-02-01 -### Changes +### Changed * Migrate to actix-service 0.2 diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index fa910da7b2..0475ee7bad 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-server" -version = "0.2.1" +version = "0.3.0" authors = ["Nikolay Kim "] description = "Actix server - General purpose tcp server" keywords = ["network", "framework", "async", "futures"] @@ -11,7 +11,7 @@ categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] edition = "2018" -workspace = "../" +workspace = ".." [package.metadata.docs.rs] features = ["ssl", "tls", "rust-tls"] @@ -33,17 +33,14 @@ ssl = ["openssl", "tokio-openssl"] rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"] [dependencies] -#actix-service = "0.2.1" -actix-service = { path="../actix-service" } +actix-service = "0.3.0" actix-rt = "0.1.0" log = "0.4" num_cpus = "1.0" -# io mio = "^0.6.13" net2 = "0.2" -bytes = "0.4" futures = "0.1" slab = "0.4" tokio-io = "0.1" diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index 4b1ec19c54..124c3fd668 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -183,9 +183,6 @@ impl ServerBuilder { /// This methods panics if no socket addresses get bound. /// /// ```rust,ignore - /// # extern crate futures; - /// # extern crate actix_web; - /// # use futures::Future; /// use actix_web::*; /// /// fn main() { diff --git a/actix-server/src/lib.rs b/actix-server/src/lib.rs index 5b90bd69fb..d1165e0b93 100644 --- a/actix-server/src/lib.rs +++ b/actix-server/src/lib.rs @@ -28,6 +28,6 @@ impl Token { } /// Start server building process -pub fn build() -> ServerBuilder { +pub fn new() -> ServerBuilder { ServerBuilder::default() }