From d530094920ca402d7b185d652eeecbe63e8708bc Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Thu, 14 Nov 2019 15:07:04 +0600 Subject: [PATCH] update version to alpha.1 --- actix-connect/Cargo.toml | 4 ++-- actix-ioframe/Cargo.toml | 6 +++--- actix-rt/src/runtime.rs | 3 +-- actix-server-config/Cargo.toml | 2 +- actix-server/Cargo.toml | 4 ++-- actix-service/src/transform.rs | 2 +- actix-testing/Cargo.toml | 6 +++--- actix-testing/src/lib.rs | 4 ++-- actix-utils/Cargo.toml | 2 +- actix-utils/src/order.rs | 1 - 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml index 8999ee43..2f33f742 100644 --- a/actix-connect/Cargo.toml +++ b/actix-connect/Cargo.toml @@ -58,6 +58,6 @@ webpki = { version = "0.21", optional = true } [dev-dependencies] bytes = "0.4" -actix-testing = { version="0.2.0" } -actix-server-config = "0.2.0" +actix-testing = { version="0.3.0-alpha.1" } +actix-server-config = "0.3.0-alpha.1" tokio = "0.2.0-alpha.6" diff --git a/actix-ioframe/Cargo.toml b/actix-ioframe/Cargo.toml index a7baf1e0..df86ad13 100644 --- a/actix-ioframe/Cargo.toml +++ b/actix-ioframe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-ioframe" -version = "0.2.0" +version = "0.3.0-alpha.1" authors = ["Nikolay Kim "] description = "Actix framed service" keywords = ["network", "framework", "async", "futures"] @@ -31,7 +31,7 @@ log = "0.4" [dev-dependencies] actix-rt = "1.0.0-alpha.1" actix-connect = "1.0.0-alpha.1" -actix-testing = "0.2.0" -actix-server-config = "0.2.0" +actix-testing = "0.3.0-alpha.1" +actix-server-config = "0.3.0-alpha.1" tokio-net = "=0.2.0-alpha.6" tokio-timer = "=0.3.0-alpha.6" diff --git a/actix-rt/src/runtime.rs b/actix-rt/src/runtime.rs index 7f42a541..ac1a6f6e 100644 --- a/actix-rt/src/runtime.rs +++ b/actix-rt/src/runtime.rs @@ -84,9 +84,8 @@ impl Runtime { /// let mut rt = Runtime::new().unwrap(); /// /// // Spawn a future onto the runtime - /// rt.spawn(future::lazy(|| { + /// rt.spawn(future::lazy(|_| { /// println!("running on the runtime"); - /// Ok(()) /// })); /// # } /// # pub fn main() {} diff --git a/actix-server-config/Cargo.toml b/actix-server-config/Cargo.toml index bf6a9c06..5a53fbb9 100644 --- a/actix-server-config/Cargo.toml +++ b/actix-server-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-server-config" -version = "0.2.0" +version = "0.3.0-alpha.1" authors = ["Nikolay Kim "] description = "Actix server config utils" homepage = "https://actix.rs" diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index a2b4f2d7..e4a9482d 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-server" -version = "0.7.0" +version = "0.8.0-alpha.1" authors = ["Nikolay Kim "] description = "Actix server - General purpose tcp server" keywords = ["network", "framework", "async", "futures"] @@ -32,7 +32,7 @@ rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-co [dependencies] actix-rt = "1.0.0-alpha.1" actix-service = "1.0.0-alpha.1" -actix-server-config = "0.2.0" +actix-server-config = "0.3.0-alpha.1" log = "0.4" num_cpus = "1.0" diff --git a/actix-service/src/transform.rs b/actix-service/src/transform.rs index e90836f5..5421ba78 100644 --- a/actix-service/src/transform.rs +++ b/actix-service/src/transform.rs @@ -86,7 +86,7 @@ where /// Apply transform to a service. Function returns /// services factory that in initialization creates /// service and applies transform to this service. -pub fn apply( +pub fn apply( t: T, service: U, ) -> impl ServiceFactory< diff --git a/actix-testing/Cargo.toml b/actix-testing/Cargo.toml index 84233bc0..a4257fbd 100644 --- a/actix-testing/Cargo.toml +++ b/actix-testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-testing" -version = "0.2.0" +version = "0.3.0-alpha.1" authors = ["Nikolay Kim "] description = "Actix testing utils" keywords = ["network", "framework", "async", "futures"] @@ -18,8 +18,8 @@ path = "src/lib.rs" [dependencies] actix-rt = "1.0.0-alpha.1" -actix-server = "0.7.0" -actix-server-config = "0.2.0" +actix-server = "0.8.0-alpha.1" +actix-server-config = "0.3.0-alpha.1" actix-service = "1.0.0-alpha.1" log = "0.4" diff --git a/actix-testing/src/lib.rs b/actix-testing/src/lib.rs index e1c8eb53..a4631eda 100644 --- a/actix-testing/src/lib.rs +++ b/actix-testing/src/lib.rs @@ -21,12 +21,12 @@ pub use self::rt::*; /// # Examples /// /// ```rust -/// use actix_service::{service_fn, IntoNewService}; +/// use actix_service::{service_fn}; /// use actix_testing::TestServer; /// /// fn main() { /// let srv = TestServer::with(|| service_fn( -/// |sock| { +/// |sock| async move { /// println!("New connection: {:?}", sock); /// Ok::<_, ()>(()) /// } diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index c57000f4..85f4212e 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -29,4 +29,4 @@ tokio-executor = { version="=0.2.0-alpha.6", features=["current-thread"] } log = "0.4" [dev-dependencies] -actix-rt = "0.2.2" +actix-rt = "1.0.0-alpha.1" diff --git a/actix-utils/src/order.rs b/actix-utils/src/order.rs index 88f2b77a..61e00fd9 100644 --- a/actix-utils/src/order.rs +++ b/actix-utils/src/order.rs @@ -211,7 +211,6 @@ mod tests { use actix_service::Service; use futures::channel::oneshot; use futures::future::{lazy, LocalBoxFuture}; - use futures::stream::{futures_unordered::FuturesUnordered, StreamExt}; struct Srv;