From 2435520e6713c197227d21be8828e5354aa956fb Mon Sep 17 00:00:00 2001 From: fakeshadow <24548779@qq.com> Date: Fri, 16 Apr 2021 06:40:21 -0700 Subject: [PATCH 1/3] Remove/restart worker test (#341) --- actix-server/tests/test_server.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index 3af072bb..cc9f8190 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -437,6 +437,7 @@ async fn test_service_restart() { let _ = h.join().unwrap(); } +#[ignore] #[actix_rt::test] async fn worker_restart() { use actix_service::{Service, ServiceFactory}; From 1c4e96536637cde59110e298b322c5332f4caeba Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Fri, 16 Apr 2021 15:18:53 +0100 Subject: [PATCH 2/3] prepare service release 2.0.0 (#339) --- actix-server/Cargo.toml | 2 +- actix-service/CHANGES.md | 3 +++ actix-service/Cargo.toml | 7 ++----- actix-service/README.md | 4 ++-- actix-tls/Cargo.toml | 2 +- actix-tracing/Cargo.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index 80b44c6d..a839dddb 100755 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -22,7 +22,7 @@ default = [] [dependencies] actix-rt = { version = "2.0.0", default-features = false } -actix-service = "2.0.0-beta.5" +actix-service = "2.0.0" actix-utils = "3.0.0-beta.4" futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] } diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index c99cc2eb..a0130dbc 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -1,6 +1,9 @@ # Changes ## Unreleased - 2021-xx-xx + + +## 2.0.0 - 2021-04-16 * Removed pipeline and related structs/functions. [#335] [#335]: https://github.com/actix/actix-net/pull/335 diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml index 1c82f703..ad03242f 100644 --- a/actix-service/Cargo.toml +++ b/actix-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-service" -version = "2.0.0-beta.5" +version = "2.0.0" authors = [ "Nikolay Kim ", "Rob Ede ", @@ -8,10 +8,7 @@ authors = [ ] description = "Service trait and combinators for representing asynchronous request/response operations." keywords = ["network", "framework", "async", "futures", "service"] -homepage = "https://actix.rs" -repository = "https://github.com/actix/actix-net.git" -documentation = "https://docs.rs/actix-service" -readme = "README.md" +repository = "https://github.com/actix/actix-net" categories = ["network-programming", "asynchronous"] license = "MIT OR Apache-2.0" edition = "2018" diff --git a/actix-service/README.md b/actix-service/README.md index 54171274..913ac199 100644 --- a/actix-service/README.md +++ b/actix-service/README.md @@ -3,10 +3,10 @@ > Service trait and combinators for representing asynchronous request/response operations. [![crates.io](https://img.shields.io/crates/v/actix-service?label=latest)](https://crates.io/crates/actix-service) -[![Documentation](https://docs.rs/actix-service/badge.svg?version=2.0.0-beta.5)](https://docs.rs/actix-service/2.0.0-beta.5) +[![Documentation](https://docs.rs/actix-service/badge.svg?version=2.0.0)](https://docs.rs/actix-service/2.0.0) [![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html) ![License](https://img.shields.io/crates/l/actix-service.svg) -[![Dependency Status](https://deps.rs/crate/actix-service/2.0.0-beta.5/status.svg)](https://deps.rs/crate/actix-service/2.0.0-beta.5) +[![Dependency Status](https://deps.rs/crate/actix-service/2.0.0/status.svg)](https://deps.rs/crate/actix-service/2.0.0) ![Download](https://img.shields.io/crates/d/actix-service.svg) [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x) diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 7fbd94b0..4e047cf5 100755 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -42,7 +42,7 @@ uri = ["http"] [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = { version = "2.2.0", default-features = false } -actix-service = "2.0.0-beta.5" +actix-service = "2.0.0" actix-utils = "3.0.0-beta.4" derive_more = "0.99.5" diff --git a/actix-tracing/Cargo.toml b/actix-tracing/Cargo.toml index ec2e4a7c..46cdc278 100644 --- a/actix-tracing/Cargo.toml +++ b/actix-tracing/Cargo.toml @@ -16,7 +16,7 @@ name = "actix_tracing" path = "src/lib.rs" [dependencies] -actix-service = "2.0.0-beta.5" +actix-service = "2.0.0" actix-utils = "3.0.0-beta.4" tracing = "0.1" From 978e4f25fb0078e02165c11784fa2694b72ed57a Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 17 Apr 2021 02:00:36 +0100 Subject: [PATCH 3/3] prepare actix-utils release 3.0.0 (#342) --- actix-server/Cargo.toml | 2 +- actix-service/Cargo.toml | 4 ++-- actix-tls/Cargo.toml | 2 +- actix-tracing/Cargo.toml | 2 +- actix-utils/CHANGES.md | 4 ++++ actix-utils/Cargo.toml | 6 +++--- actix-utils/src/lib.rs | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index a839dddb..a1cf520a 100755 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -23,7 +23,7 @@ default = [] [dependencies] actix-rt = { version = "2.0.0", default-features = false } actix-service = "2.0.0" -actix-utils = "3.0.0-beta.4" +actix-utils = "3.0.0" futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] } log = "0.4" diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml index ad03242f..7865cd86 100644 --- a/actix-service/Cargo.toml +++ b/actix-service/Cargo.toml @@ -8,8 +8,8 @@ authors = [ ] description = "Service trait and combinators for representing asynchronous request/response operations." keywords = ["network", "framework", "async", "futures", "service"] -repository = "https://github.com/actix/actix-net" categories = ["network-programming", "asynchronous"] +repository = "https://github.com/actix/actix-net" license = "MIT OR Apache-2.0" edition = "2018" @@ -24,5 +24,5 @@ pin-project-lite = "0.2" [dev-dependencies] actix-rt = "2.0.0" -actix-utils = "3.0.0-beta.4" +actix-utils = "3.0.0" futures-util = { version = "0.3.7", default-features = false } diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 4e047cf5..73395a14 100755 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -43,7 +43,7 @@ uri = ["http"] actix-codec = "0.4.0-beta.1" actix-rt = { version = "2.2.0", default-features = false } actix-service = "2.0.0" -actix-utils = "3.0.0-beta.4" +actix-utils = "3.0.0" derive_more = "0.99.5" futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] } diff --git a/actix-tracing/Cargo.toml b/actix-tracing/Cargo.toml index 46cdc278..2ed2c434 100644 --- a/actix-tracing/Cargo.toml +++ b/actix-tracing/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] actix-service = "2.0.0" -actix-utils = "3.0.0-beta.4" +actix-utils = "3.0.0" tracing = "0.1" tracing-futures = "0.2" diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index d14446de..79f171b4 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/CHANGES.md @@ -3,6 +3,10 @@ ## Unreleased - 2021-xx-xx +## 3.0.0 - 2021-04-16 +* No significant changes from `3.0.0-beta.4`. + + ## 3.0.0-beta.4 - 2021-04-01 * Add `future::Either` type. [#305] diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index 8b593697..a94706a2 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "actix-utils" -version = "3.0.0-beta.4" +version = "3.0.0" authors = [ "Nikolay Kim ", "Rob Ede ", ] -description = "Utilities for the Actix ecosystem" +description = "Various utilities used in the Actix ecosystem" keywords = ["network", "framework", "async", "futures"] -repository = "https://github.com/actix/actix-net.git" categories = ["network-programming", "asynchronous"] +repository = "https://github.com/actix/actix-net" license = "MIT OR Apache-2.0" edition = "2018" diff --git a/actix-utils/src/lib.rs b/actix-utils/src/lib.rs index f94147ec..6d431d52 100644 --- a/actix-utils/src/lib.rs +++ b/actix-utils/src/lib.rs @@ -1,4 +1,4 @@ -//! Various utilities for the Actix ecosystem. +//! Various utilities used in the Actix ecosystem. #![deny(rust_2018_idioms, nonstandard_style)] #![warn(missing_docs)]