update deps

Cargo.toml

@@ -27,7 +27,7 @@ members = [
 ]
 
 [dev-dependencies]
-actix-service = { path="actix-service" }
+actix-service = "0.3.3"
 actix-codec = "0.1.1"
 actix-rt = "0.2.0"
 actix-server = { path="actix-server", features=["ssl"] }

actix-connector/Cargo.toml

@@ -27,9 +27,8 @@ default = []
 ssl = ["openssl", "tokio-openssl"]
 
 [dependencies]
-#actix-service = "0.3.0"
+actix-service = "0.3.3"
-actix-service = { path="../actix-service" }
+actix-codec = "0.1.1"
-actix-codec = "0.1.0"
 futures = "0.1"
 tokio-tcp = "0.1"
 tokio-current-thread = "0.1"

actix-server-config/Cargo.toml

@@ -14,5 +14,4 @@ name = "actix_server_config"
 path = "src/lib.rs"
 
 [dependencies]
-actix-service = { path="../actix-service" }
 futures = "0.1.25"

actix-server/Cargo.toml

@@ -34,8 +34,7 @@ rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
 
 [dependencies]
 actix-rt = "0.2.0"
-#actix-service = "0.3.2"
+actix-service = "0.3.3"
-actix-service = { path="../actix-service" }
 actix-server-config = { path="../actix-server-config" }
 
 log = "0.4"

actix-test-server/Cargo.toml

@@ -33,8 +33,8 @@ ssl = ["openssl", "actix-server/ssl"]
 rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
 
 [dependencies]
-actix-rt = "0.1.0"
+actix-rt = "0.2.0"
-#actix-server = "0.3.0"
+# actix-server = "0.3.3"
 actix-server = { path="../actix-server" }
 
 log = "0.4"
@@ -54,3 +54,6 @@ rustls = { version = "^0.15", optional = true }
 tokio-rustls = { version = "^0.9", optional = true }
 webpki = { version = "0.19", optional = true }
 webpki-roots = { version = "0.16", optional = true }
+
+[dev-dependencies]
+actix-service = "0.3.3"

actix-test-server/src/lib.rs

@@ -13,27 +13,24 @@ use tokio_tcp::TcpStream;
 /// The `TestServer` type.
 ///
 /// `TestServer` is very simple test server that simplify process of writing
-/// integration tests cases for actix applications.
+/// integration tests for actix-net applications.
 ///
 /// # Examples
 ///
 /// ```rust
-/// # extern crate actix_test_server;
+/// use actix_service::{fn_service, IntoNewService};
-/// # use actix_web::*;
-/// #
-/// # fn my_handler(req: &HttpRequest) -> HttpResponse {
-/// #     HttpResponse::Ok().into()
-/// # }
-/// #
-/// # fn main() {
 /// use actix_test_server::TestServer;
 ///
-/// let mut srv = TestServer::new(|app| app.handler(my_handler));
+/// fn main() {
+///     let srv = TestServer::with(|| fn_service(
+///         |sock| {
+///             println!("New connection: {:?}", sock);
+///             Ok::<_, ()>(())
+///         }
+///     ));
 ///
-/// let req = srv.get().finish().unwrap();
+///     println!("SOCKET: {:?}", srv.connect());
-/// let response = srv.execute(req.send()).unwrap();
+/// }
-/// assert!(response.status().is_success());
-/// # }
 /// ```
 pub struct TestServer;
 
@@ -57,13 +54,13 @@ impl TestServer {
             let local_addr = tcp.local_addr().unwrap();
 
             Server::build()
-                .listen("test", tcp, factory)
+                .listen("test", tcp, factory)?
                 .workers(1)
                 .disable_signals()
                 .start();
 
             tx.send((System::current(), local_addr)).unwrap();
-            sys.run();
+            sys.run()
         });
 
         let (system, addr) = rx.recv().unwrap();

actix-utils/CHANGES.md

@@ -1,10 +1,5 @@
 # Changes
 
-## [0.4.0] - 2019-03-xx
-
-* Upgrade actix-service
-
-
 ## [0.3.2] - 2019-03-04
 
 ### Changed

actix-utils/Cargo.toml

@@ -18,9 +18,8 @@ name = "actix_utils"
 path = "src/lib.rs"
 
 [dependencies]
-#actix-service = "0.3.2"
+actix-service = "0.3.3"
-actix-service = { path="../actix-service" }
+actix-codec = "0.1.1"
-actix-codec = "0.1.0"
 bytes = "0.4"
 futures = "0.1.24"
 tokio-timer = "0.2.8"
@@ -28,4 +27,4 @@ tokio-current-thread = "0.1.4"
 log = "0.4"
 
 [dev-dependencies]
-actix-rt = "0.1"
+actix-rt = "0.2"