adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Pull in fix for tokio-rs/tokio#5502

Browse source
This commit is contained in:
Adrian Heine 2023-03-04 14:01:20 +01:00
parent b32b0eaedc
commit b9d1303d06
2 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -10,7 +10,7 @@ users = "0.11.0"
regex = "1.0.1" regex = "1.0.1"
futures-util = "0.3" futures-util = "0.3"
async-trait = "0.1.65" async-trait = "0.1.65"
tokio = { version = "1.6.1", features = ["rt", "process", "io-util", "macros", "sync"] } tokio = { version = "1.26", features = ["rt", "process", "io-util", "macros", "sync"] }
once_cell = "1.4" once_cell = "1.4"
slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] }
slog-term = "2.5" slog-term = "2.5"

11
src/setup/core.rs
View file

@ -21,17 +21,6 @@ pub trait AddGeneric<X: ToArtifact> {
} }
macro_rules! add_generic { macro_rules! add_generic {
// Workaround for https://github.com/tokio-rs/tokio/issues/5502
() => (
#[async_trait(?Send)]
impl<SR, L, B, Rs, As> AddGeneric<()> for Setup<SR, L, B, Rs, As>
{
async fn add_generic(&self, _: &Rc<Logger>, (): ()) -> Result<((), bool), Box<dyn Error>>
{
Ok(((), false))
}
}
);
( $($name:ident)* ) => ( ( $($name:ident)* ) => (
#[async_trait(?Send)] #[async_trait(?Send)]
#[allow(non_snake_case)] #[allow(non_snake_case)]