Commit 1be1b161 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Upgrade async_executors dependency to 0.7.0

parent 1e1bdc04

Cargo.lock

+5 −5
Original line number Diff line number Diff line
@@ -602,9 +602,9 @@ dependencies = [ 


[[package]]

name = "async_executors"

version = "0.6.0"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c0b2463773401e1f684136f9cdb956cf611f22172472cf3f049e72123f59e359"

checksum = "a982d2f86de6137cc05c9db9a915a19886c97911f9790d04f174cede74be01a5"

dependencies = [

 "async-std",

 "blanket",
@@ -771,13 +771,13 @@ dependencies = [ 


[[package]]

name = "blanket"

version = "0.2.0"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7b04ce3d2372d05d1ef4ea3fdf427da6ae3c17ca06d688a107b5344836276bc3"

checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "syn 2.0.31",

]



[[package]]

crates/tor-rtcompat/Cargo.toml

+8 −2
Original line number Diff line number Diff line
@@ -17,7 +17,13 @@ default = [] 
full = ["async-std", "tokio", "native-tls"]



async-std = ["async-std-crate", "async-io", "async_executors/async_std"]

tokio = ["tokio-crate", "tokio-util", "async_executors/tokio_tp"]

tokio = [

    "tokio-crate",

    "tokio-util",

    "async_executors/tokio_tp",

    "async_executors/tokio_timer",

    "async_executors/tokio_io",

]

static = ["native-tls-crate?/vendored", "__is_nonadditive"]

native-tls = ["native-tls-crate", "async-native-tls"]
@@ -34,7 +40,7 @@ async-native-tls = { version = "0.5.0", optional = true } 
async-rustls = { version = "0.4.0", optional = true }

async-std-crate = { package = "async-std", version = "1.7.0", optional = true }

async-trait = "0.1.54"

async_executors = { version = "0.6.0", default-features = false }

async_executors = { version = "0.7.0", default-features = false }

educe = "0.4.6"

futures = "0.3.14"

native-tls-crate = { package = "native-tls", version = "0.2", optional = true }

crates/tor-rtcompat/src/impls/tokio.rs

+3 −4
Original line number Diff line number Diff line
@@ -171,10 +171,9 @@ impl crate::traits::UdpProvider for TokioRuntimeHandle { 


/// Create and return a new Tokio multithreaded runtime.

pub(crate) fn create_runtime() -> IoResult<TokioRuntimeHandle> {

    let mut builder = async_executors::TokioTpBuilder::new();

    builder.tokio_builder().enable_all();

    let owned = builder.build()?;

    Ok(owned.into())

    let runtime = async_executors::exec::TokioTp::new()

        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;

    Ok(runtime.into())

}



/// Wrapper around a Handle to a tokio runtime.