From 16d2d78b874bda9781439b048b901f822ab49282 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 15:03:42 +0000
Subject: [PATCH] fix(deps): update cargo pre-1.0 packages

---
 Cargo.lock                        | 167 ++++++++++++++++++++++++------
 apollo-router-scaffold/Cargo.toml |   2 +-
 apollo-router/Cargo.toml          |  10 +-
 xtask/Cargo.lock                  |   6 +-
 xtask/Cargo.toml                  |   2 +-
 5 files changed, 145 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f23701a524b..6218e17a828 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -184,7 +184,7 @@ dependencies = [
  "atty",
  "axum",
  "backtrace",
- "base64 0.20.0",
+ "base64 0.21.0",
  "buildstructor 0.5.1",
  "bytes",
  "ci_info",
@@ -200,7 +200,7 @@ dependencies = [
  "displaydoc",
  "flate2",
  "futures",
- "graphql_client",
+ "graphql_client 0.12.0",
  "heck 0.4.1",
  "hex",
  "http",
@@ -219,7 +219,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "linkme",
- "lru 0.8.1",
+ "lru",
  "maplit",
  "mediatype",
  "memchr",
@@ -245,7 +245,7 @@ dependencies = [
  "prost-types",
  "proteus",
  "rand 0.8.5",
- "redis",
+ "redis 0.22.3",
  "redis_cluster_async",
  "regex",
  "reqwest",
@@ -327,7 +327,7 @@ dependencies = [
  "regex",
  "str_inflector",
  "tempfile",
- "toml",
+ "toml 0.7.1",
 ]
 
 [[package]]
@@ -409,7 +409,7 @@ dependencies = [
  "quote",
  "serde",
  "syn",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -602,12 +602,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
 [[package]]
 name = "base64"
 version = "0.21.0"
@@ -761,7 +755,7 @@ dependencies = [
  "serde",
  "shell-words",
  "structopt",
- "toml",
+ "toml 0.5.11",
  "walkdir 2.3.2",
 ]
 
@@ -1346,7 +1340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb9d051b9bf071ea8ad0cdb45b15870912acbe5e2ec64844e7807c9e1dc4c56a"
 dependencies = [
  "async-trait",
- "lru 0.9.0",
+ "lru",
  "thiserror",
  "tokio",
  "tracing",
@@ -2056,7 +2050,18 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc"
 dependencies = [
- "graphql_query_derive",
+ "graphql_query_derive 0.11.0",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "graphql_client"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa61bb9dc6d373a8b465a5da17b62809483e8527a34b0e9034dc0915b09e160a"
+dependencies = [
+ "graphql_query_derive 0.12.0",
  "serde",
  "serde_json",
 ]
@@ -2078,13 +2083,41 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "graphql_client_codegen"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e55df64cc702c4ad6647f8df13a799ad11688a3781fadf5045f7ba12733fa9b"
+dependencies = [
+ "graphql-introspection-query",
+ "graphql-parser",
+ "heck 0.4.1",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
 [[package]]
 name = "graphql_query_derive"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce"
 dependencies = [
- "graphql_client_codegen",
+ "graphql_client_codegen 0.11.0",
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "graphql_query_derive"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98"
+dependencies = [
+ "graphql_client_codegen 0.12.0",
  "proc-macro2",
  "syn",
 ]
@@ -2543,7 +2576,7 @@ checksum = "b9360a9dd04f347bf40cbb128bf622d4ef524fb89aee8cff836b88471d4f14dd"
 dependencies = [
  "apollo-encoder 0.3.4",
  "backoff",
- "graphql_client",
+ "graphql_client 0.11.0",
  "hyper",
  "reqwest",
  "serde",
@@ -2917,15 +2950,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "lru"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
-dependencies = [
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "lru"
 version = "0.9.0"
@@ -3168,6 +3192,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "normalize-line-endings"
 version = "0.3.0"
@@ -3942,7 +3975,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
  "once_cell",
  "thiserror",
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -4203,12 +4236,32 @@ dependencies = [
  "combine 4.6.6",
  "futures-util",
  "itoa",
- "native-tls",
  "percent-encoding",
  "pin-project-lite",
  "ryu",
  "sha1 0.6.1",
  "tokio",
+ "tokio-util",
+ "url",
+]
+
+[[package]]
+name = "redis"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa8455fa3621f6b41c514946de66ea0531f57ca017b2e6c7cc368035ea5b46df"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "combine 4.6.6",
+ "futures-util",
+ "itoa",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "ryu",
+ "sha1_smol",
+ "tokio",
  "tokio-native-tls",
  "tokio-util",
  "url",
@@ -4225,7 +4278,7 @@ dependencies = [
  "log",
  "pin-project-lite",
  "rand 0.8.5",
- "redis",
+ "redis 0.21.7",
  "tokio",
 ]
 
@@ -4892,6 +4945,15 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4920,14 +4982,15 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.26"
+version = "0.9.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567"
 dependencies = [
  "indexmap",
+ "itoa",
  "ryu",
  "serde",
- "yaml-rust",
+ "unsafe-libyaml",
 ]
 
 [[package]]
@@ -5638,6 +5701,40 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f35c303ea3e062b6131be4de16debe23860b9d3f2396658f13b7af1987fb473"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+]
+
 [[package]]
 name = "tonic"
 version = "0.8.3"
@@ -6032,6 +6129,12 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
index d7dbbf5275e..33ac16255b8 100644
--- a/apollo-router-scaffold/Cargo.toml
+++ b/apollo-router-scaffold/Cargo.toml
@@ -12,7 +12,7 @@ clap = { version = "4.1.4", features = ["derive"] }
 cargo-scaffold = { version = "0.8.7", default-features = false }
 regex = "1"
 str_inflector = "0.12.0"
-toml = "0.5.11"
+toml = "0.7.1"
 [dev-dependencies]
 tempfile = "3.3.0"
 copy_dir = "0.1.2"
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index f988f0846da..e0a34063952 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -55,7 +55,7 @@ async-trait = "0.1.64"
 atty = "0.2.14"
 axum = { version = "0.6.4", features = ["headers", "json", "original-uri"] }
 backtrace = "0.3.67"
-base64 = "0.20.0"
+base64 = "0.21.0"
 buildstructor = "0.5.1"
 bytes = "1.2.1"
 clap = { version = "4.1.4", default-features = false, features = [
@@ -79,7 +79,7 @@ directories = "4.0.1"
 displaydoc = "0.2"
 flate2 = "1.0.25"
 futures = { version = "0.3.26", features = ["thread-pool"] }
-graphql_client = "0.11.0"
+graphql_client = "0.12.0"
 hex = "0.4.3"
 http = "0.2.8"
 http-body = "0.4.5"
@@ -96,7 +96,7 @@ jsonwebtoken = "8.2.0"
 lazy_static = "1.4.0"
 libc = "0.2.139"
 linkme = "0.3.7"
-lru = "0.8.1"
+lru = "0.9.0"
 mediatype = "0.19.13"
 mockall = "0.11.3"
 miette = { version = "5.5.0", features = ["fancy"] }
@@ -151,7 +151,7 @@ prost-types = "0.11.6"
 proteus = "0.5.0"
 rand = "0.8.5"
 rhai = { version = "1.12.0", features = ["sync", "serde", "internals"] }
-redis = { version = "0.21.7", features = ["tokio-comp", "tls", "tokio-native-tls-comp"] }
+redis = { version = "0.22.3", features = ["tokio-comp", "tls", "tokio-native-tls-comp"] }
 redis_cluster_async = "0.7.0"
 regex = "1.6.0"
 reqwest = { version = "0.11.14", default-features = false, features = [
@@ -171,7 +171,7 @@ serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
 serde_json = { version = "1.0.85", features = ["preserve_order"] }
 serde_millis = "0.1.1"
 serde_urlencoded = "0.7.1"
-serde_yaml = "0.8.26"
+serde_yaml = "0.9.17"
 static_assertions = "1.1.0"
 strum_macros = "0.24.3"
 sys-info = "0.9.1"
diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
index 3300292c8b5..4bc452f6d3d 100644
--- a/xtask/Cargo.lock
+++ b/xtask/Cargo.lock
@@ -83,9 +83,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
 [[package]]
 name = "bitflags"
@@ -2503,7 +2503,7 @@ version = "1.5.0"
 dependencies = [
  "ansi_term",
  "anyhow",
- "base64 0.20.0",
+ "base64 0.21.0",
  "camino",
  "cargo_metadata",
  "chrono",
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index dad16fb3680..324d6cce8a2 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 ansi_term = "0.12"
 anyhow = "1"
-base64 = "0.20"
+base64 = "0.21"
 camino = "1"
 cargo_metadata = "0.15"
 chrono = "0.4.23"