Merge b32766b863706c436fc3f597dbba87db7b36a2b3 into 7d1e85e575dcf67e2fc27dc6c79b53f591791948

Cargo.lock

@@ -448,7 +448,7 @@ dependencies = [
  "async-io 1.13.0",
  "async-trait",
  "futures-core",
- "reactor-trait",
+ "reactor-trait 1.1.0",
 ]
 
 [[package]]
@@ -2731,7 +2731,7 @@ dependencies = [
  "futures-io",
  "parking_lot",
  "pinky-swear",
- "reactor-trait",
+ "reactor-trait 1.1.0",
  "serde",
  "tracing",
  "waker-fn",
@@ -3912,6 +3912,17 @@ dependencies = [
  "futures-io",
 ]
 
+[[package]]
+name = "reactor-trait"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2eb4ff39ed91c79034b2856a73b07bc8afd752c981bc4433bcbeff531e275a"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "futures-io",
+]
+
 [[package]]
 name = "redis"
 version = "0.29.2"
@@ -5089,16 +5100,17 @@ dependencies = [
 
 [[package]]
 name = "tokio-reactor-trait"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9481a72f36bd9cbb8d6dd349227c4783e234e4332cfe806225bc929c4b92486"
+checksum = "890b2de29a909d511eaaabb0405f72d5c4df3ce35a24aeaf94974037699b5a81"
 dependencies = [
  "async-trait",
  "futures-core",
  "futures-io",
- "reactor-trait",
+ "reactor-trait 2.0.0",
  "tokio",
  "tokio-stream",
+ "tokio-util",
 ]
 
 [[package]]
@@ -5141,6 +5153,7 @@ checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
 dependencies = [
  "bytes",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",

chirpstack/Cargo.toml

@@ -71,7 +71,7 @@
   gcp_auth = "0.12"
   lapin = { version = "2.5", default-features = false }
   tokio-executor-trait = "2.1"
-  tokio-reactor-trait = "1.1"
+  tokio-reactor-trait = "2.0"
   rdkafka = { version = "0.37", default-features = false, features = [
     "tokio",
     "cmake-build",