migrate to actix-service 0.2

test-server/Cargo.toml

@@ -30,11 +30,11 @@ session = ["cookie/secure"]
 
 [dependencies]
 actix-codec = "0.1"
-actix-service = "0.1.6"
+actix-service = "0.2.0"
 actix-rt = "0.1.0"
-actix-server = "0.1.0"
+actix-server = "0.2.0"
+actix-utils = "0.2.0"
 actix-http = { path=".." }
-actix-utils = { git = "https://github.com/actix/actix-net.git" }
 
 base64 = "0.10"
 bytes = "0.4"

test-server/src/lib.rs

@@ -57,7 +57,8 @@ impl TestServer {
     pub fn with_factory<F: StreamServiceFactory>(
         factory: F,
     ) -> TestServerRuntime<
-        impl Service<Connect, Response = impl Connection, Error = ConnectorError> + Clone,
+        impl Service<Request = Connect, Response = impl Connection, Error = ConnectorError>
+            + Clone,
     > {
         let (tx, rx) = mpsc::channel();
 
@@ -89,8 +90,11 @@ impl TestServer {
     }
 
     fn new_connector(
-    ) -> impl Service<Connect, Response = impl Connection, Error = ConnectorError> + Clone
-    {
+    ) -> impl Service<
+        Request = Connect,
+        Response = impl Connection,
+        Error = ConnectorError,
+    > + Clone {
         #[cfg(feature = "ssl")]
         {
             use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode};
@@ -191,7 +195,7 @@ impl<T> TestServerRuntime<T> {
 
 impl<T> TestServerRuntime<T>
 where
-    T: Service<Connect, Error = ConnectorError> + Clone,
+    T: Service<Request = Connect, Error = ConnectorError> + Clone,
     T::Response: Connection,
 {
     /// Connect to websocket server at a given path