actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-30 18:44:36 +01:00
Code Issues Releases Wiki Activity

Fix actix-service 1.0.3 compatibility

Browse Source
This commit is contained in:
Nikolay Kim 2020-01-15 11:58:06 -08:00
parent aed5fecc8a
commit 5940731ef0
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-connect/CHANGES.md
View File

@ -1,5 +1,9 @@
# Changes # Changes
## [1.0.2] - 2020-01-15
* Fix actix-service 1.0.3 compatibility
## [1.0.1] - 2019-12-15 ## [1.0.1] - 2019-12-15
* Fix trust-dns-resolver compilation * Fix trust-dns-resolver compilation

9
actix-connect/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-connect" name = "actix-connect"
version = "1.0.1" version = "1.0.2"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix connect - tcp connector service" description = "Actix connect - tcp connector service"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -10,7 +10,6 @@ documentation = "https://docs.rs/actix-connect/"
categories = ["network-programming", "asynchronous"] categories = ["network-programming", "asynchronous"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
edition = "2018" edition = "2018"
workspace = ".."
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["openssl", "rustls", "uri"] features = ["openssl", "rustls", "uri"]
@ -32,12 +31,12 @@ rustls = ["rust-tls", "tokio-rustls", "webpki"]
uri = ["http"] uri = ["http"]
[dependencies] [dependencies]
actix-service = "1.0.0" actix-service = "1.0.3"
actix-codec = "0.2.0" actix-codec = "0.2.0"
actix-utils = "1.0.3" actix-utils = "1.0.6"
actix-rt = "1.0.0" actix-rt = "1.0.0"
derive_more = "0.99.2" derive_more = "0.99.2"
either = "1.5.2" either = "1.5.3"
futures = "0.3.1" futures = "0.3.1"
http = { version = "0.2.0", optional = true } http = { version = "0.2.0", optional = true }
log = "0.4" log = "0.4"

8
actix-connect/src/lib.rs
View File

@ -72,7 +72,7 @@ pub fn start_default_resolver() -> AsyncResolver {
} }
/// Create tcp connector service /// Create tcp connector service
pub fn new_connector<T: Address>( pub fn new_connector<T: Address + 'static>(
resolver: AsyncResolver, resolver: AsyncResolver,
) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError> ) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
+ Clone { + Clone {
@ -80,7 +80,7 @@ pub fn new_connector<T: Address>(
} }
/// Create tcp connector service /// Create tcp connector service
pub fn new_connector_factory<T: Address>( pub fn new_connector_factory<T: Address + 'static>(
resolver: AsyncResolver, resolver: AsyncResolver,
) -> impl ServiceFactory< ) -> impl ServiceFactory<
Config = (), Config = (),
@ -93,14 +93,14 @@ pub fn new_connector_factory<T: Address>(
} }
/// Create connector service with default parameters /// Create connector service with default parameters
pub fn default_connector<T: Address>( pub fn default_connector<T: Address + 'static>(
) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError> ) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
+ Clone { + Clone {
pipeline(Resolver::default()).and_then(TcpConnector::new()) pipeline(Resolver::default()).and_then(TcpConnector::new())
} }
/// Create connector service factory with default parameters /// Create connector service factory with default parameters
pub fn default_connector_factory<T: Address>() -> impl ServiceFactory< pub fn default_connector_factory<T: Address + 'static>() -> impl ServiceFactory<
Config = (), Config = (),
Request = Connect<T>, Request = Connect<T>,
Response = Connection<T, TcpStream>, Response = Connection<T, TcpStream>,