From b9d1303d06eca2a31c60e9fee5c4f31ee46ec142 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sat, 4 Mar 2023 14:01:20 +0100
Subject: [PATCH] Pull in fix for tokio-rs/tokio#5502

---
 Cargo.toml        |  2 +-
 src/setup/core.rs | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fad5fde..329a080 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ users = "0.11.0"
 regex = "1.0.1"
 futures-util = "0.3"
 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"
 slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] }
 slog-term = "2.5"
diff --git a/src/setup/core.rs b/src/setup/core.rs
index 9512fb5..7f29711 100644
--- a/src/setup/core.rs
+++ b/src/setup/core.rs
@@ -21,17 +21,6 @@ pub trait AddGeneric<X: ToArtifact> {
 }
 
 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)* ) => (
     #[async_trait(?Send)]
     #[allow(non_snake_case)]