From a77b70aed2f1cc58a34bc7598ca39b533008157b Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 4 Feb 2021 20:44:13 +0000 Subject: [PATCH] prepare service 2.0.0-beta.4 release (#269) --- actix-macros/Cargo.toml | 2 +- actix-server/Cargo.toml | 2 +- actix-service/CHANGES.md | 11 +++++++---- actix-service/Cargo.toml | 3 ++- actix-service/README.md | 8 ++++++++ actix-tls/Cargo.toml | 2 +- actix-tls/src/connect/ssl/rustls.rs | 2 +- actix-tracing/Cargo.toml | 2 +- actix-utils/Cargo.toml | 2 +- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/actix-macros/Cargo.toml b/actix-macros/Cargo.toml index 5da49b16..0555f990 100644 --- a/actix-macros/Cargo.toml +++ b/actix-macros/Cargo.toml @@ -17,7 +17,7 @@ quote = "1.0.3" syn = { version = "^1", features = ["full"] } [dev-dependencies] -actix-rt = "2.0.0-beta.3" +actix-rt = "2.0.0" futures-util = { version = "0.3", default-features = false } trybuild = "1" diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index db9d4d8b..8b968352 100755 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -25,7 +25,7 @@ default = [] [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = { version = "2.0.0", default-features = false } -actix-service = "2.0.0-beta.3" +actix-service = "2.0.0-beta.4" actix-utils = "3.0.0-beta.1" futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] } diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index 4a99d60a..f5da9d2e 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -1,10 +1,13 @@ # Changes ## Unreleased - 2021-xx-xx -* `Service::poll_ready` and `Service::call` take `&self`. [#247] -* `apply_fn` and `apply_fn_factory` would take `Fn(Req, &Service)` function type [#247] -* `apply_cfg` and `apply_cfg_factory` would take `Fn(Req, &Service)` function type [#247] -* `fn_service` module would take `Fn(Req)` function type. [#247] + + +## 2.0.0-beta.4 - 2021-02-04 +* `Service::poll_ready` and `Service::call` receive `&self`. [#247] +* `apply_fn` and `apply_fn_factory` now receive `Fn(Req, &Service)` function type. [#247] +* `apply_cfg` and `apply_cfg_factory` now receive `Fn(Req, &Service)` function type. [#247] +* `fn_service` and friends now receive `Fn(Req)` function type. [#247] [#247]: https://github.com/actix/actix-net/pull/247 diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml index ce18ba66..eecf4669 100644 --- a/actix-service/Cargo.toml +++ b/actix-service/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "actix-service" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" authors = [ "Nikolay Kim ", "Rob Ede ", + "fakeshadow <24548779@qq.com>", ] description = "Service trait and combinators for representing asynchronous request/response operations." keywords = ["network", "framework", "async", "futures", "service"] diff --git a/actix-service/README.md b/actix-service/README.md index 1656f6b5..28c38295 100644 --- a/actix-service/README.md +++ b/actix-service/README.md @@ -2,4 +2,12 @@ > 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.4)](https://docs.rs/actix-service/2.0.0-beta.4) +[![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.4/status.svg)](https://deps.rs/crate/actix-service/2.0.0-beta.4) +[![Download](https://img.shields.io/crates/d/actix-service.svg)](https://crates.io/crates/actix-service) +[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x) + See documentation for detailed explanations of these components: https://docs.rs/actix-service. diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 61853b60..09d47157 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.0.0", default-features = false } -actix-service = "2.0.0-beta.3" +actix-service = "2.0.0-beta.4" actix-utils = "3.0.0-beta.1" derive_more = "0.99.5" diff --git a/actix-tls/src/connect/ssl/rustls.rs b/actix-tls/src/connect/ssl/rustls.rs index 811c7adc..46b4b11d 100755 --- a/actix-tls/src/connect/ssl/rustls.rs +++ b/actix-tls/src/connect/ssl/rustls.rs @@ -14,8 +14,8 @@ use actix_codec::{AsyncRead, AsyncWrite}; use actix_service::{Service, ServiceFactory}; use futures_core::{future::LocalBoxFuture, ready}; use log::trace; -use tokio_rustls::{Connect, TlsConnector}; use tokio_rustls::webpki::DNSNameRef; +use tokio_rustls::{Connect, TlsConnector}; use crate::connect::{Address, Connection}; diff --git a/actix-tracing/Cargo.toml b/actix-tracing/Cargo.toml index 23d785cb..60ad1454 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.3" +actix-service = "2.0.0-beta.4" futures-util = { version = "0.3.4", default-features = false } tracing = "0.1" diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index 8b19937f..4c1e6569 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] actix-codec = "0.4.0-beta.1" actix-rt = { version = "2.0.0", default-features = false } -actix-service = "2.0.0-beta.3" +actix-service = "2.0.0-beta.4" futures-core = { version = "0.3.7", default-features = false } futures-sink = { version = "0.3.7", default-features = false }