From 788728f3df74f6cf6da042452d4ebae6ac04bfbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Dec 2021 03:05:37 +0000
Subject: [PATCH] Bump tokio from 1.12.0 to 1.15.0

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.12.0 to 1.15.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.12.0...tokio-1.15.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 51 +++++++++++++++++++++++++--------------------------
 Cargo.toml |  2 +-
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 51ab49b..3d79d10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -80,7 +80,7 @@ dependencies = [
  "futures-core",
  "memchr",
  "pin-project-lite 0.2.7",
- "tokio 1.12.0",
+ "tokio 1.15.0",
 ]
 
 [[package]]
@@ -978,7 +978,7 @@ dependencies = [
  "http 0.2.4",
  "indexmap",
  "slab",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-util",
  "tracing",
 ]
@@ -1141,7 +1141,7 @@ dependencies = [
  "itoa",
  "pin-project-lite 0.2.7",
  "socket2",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tower-service",
  "tracing",
  "want",
@@ -1156,7 +1156,7 @@ dependencies = [
  "bytes 1.1.0",
  "hyper",
  "native-tls",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-native-tls",
 ]
 
@@ -1383,7 +1383,7 @@ dependencies = [
  "kube-runtime",
  "serde",
  "serde_json",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-stream",
  "tracing",
  "tracing-futures",
@@ -1427,7 +1427,7 @@ dependencies = [
  "static_assertions",
  "thiserror",
  "time 0.2.27",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "url 2.2.2",
 ]
 
@@ -1459,7 +1459,7 @@ dependencies = [
  "serde",
  "smallvec",
  "snafu",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-util",
 ]
 
@@ -1503,7 +1503,7 @@ dependencies = [
  "tempdir",
  "thiserror",
  "tokio 0.2.25",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-compat-02",
  "tokio-stream",
  "tonic",
@@ -1865,7 +1865,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tracing",
  "www-authenticate",
 ]
@@ -2430,7 +2430,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-native-tls",
  "tokio-util",
  "url 2.2.2",
@@ -2869,7 +2869,7 @@ dependencies = [
  "systemd",
  "tar",
  "thiserror",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "url 2.2.2",
  "zbus",
  "zvariant",
@@ -3198,11 +3198,10 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc"
+checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
 dependencies = [
- "autocfg",
  "bytes 1.1.0",
  "libc",
  "memchr",
@@ -3211,7 +3210,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite 0.2.7",
  "signal-hook-registry",
- "tokio-macros 1.3.0",
+ "tokio-macros 1.7.0",
  "winapi 0.3.9",
 ]
 
@@ -3225,7 +3224,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite 0.2.7",
  "tokio 0.2.25",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-stream",
 ]
 
@@ -3242,9 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3258,7 +3257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.12.0",
+ "tokio 1.15.0",
 ]
 
 [[package]]
@@ -3268,7 +3267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "webpki",
 ]
 
@@ -3280,7 +3279,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.7",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-util",
 ]
 
@@ -3293,7 +3292,7 @@ dependencies = [
  "futures-util",
  "log",
  "pin-project 1.0.8",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tungstenite",
 ]
 
@@ -3309,7 +3308,7 @@ dependencies = [
  "log",
  "pin-project-lite 0.2.7",
  "slab",
- "tokio 1.12.0",
+ "tokio 1.15.0",
 ]
 
 [[package]]
@@ -3341,7 +3340,7 @@ dependencies = [
  "pin-project 1.0.8",
  "prost",
  "prost-derive",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-rustls",
  "tokio-stream",
  "tokio-util",
@@ -3375,7 +3374,7 @@ dependencies = [
  "pin-project 1.0.8",
  "rand 0.8.4",
  "slab",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-stream",
  "tokio-util",
  "tower-layer",
@@ -3672,7 +3671,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.12.0",
+ "tokio 1.15.0",
  "tokio-rustls",
  "tokio-stream",
  "tokio-tungstenite",
diff --git a/Cargo.toml b/Cargo.toml
index 08db924..ac0c6d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ strum_macros = "0.22"
 systemd = { version = "0.9", default-features = false, features = ["journal"] }
 tar = "0.4"
 thiserror = "1.0"
-tokio = { version = "1.12", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.15", features = ["macros", "rt-multi-thread", "time"] }
 url = "2.2"
 zbus = { git = "https://gitlab.freedesktop.org/dbus/zbus", rev = "ff08cbbbcd3eead16464012b92e3862d4dcb6f16" } # version 2.0.0-beta.6 + merge request !354 (fixes a race condition) + commit 6cdfe48cda5e0bf7b0dd8675be7a84439678afa9 (fixes another race condition)
 zvariant = { git = "https://gitlab.freedesktop.org/dbus/zbus", rev = "ff08cbbbcd3eead16464012b92e3862d4dcb6f16" } # version 2.8.0 which is compatible with the zbus version