diff --git a/Cargo.lock b/Cargo.lock index 398e9582d..4b68beaae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-simd" @@ -259,32 +259,36 @@ dependencies = [ "atty", "bitflags 1.3.2", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.2", - "textwrap 0.16.0", + "clap_builder", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ - "os_str_bytes", + "anstyle", + "clap_lex", ] +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + [[package]] name = "cmake" version = "0.1.50" @@ -342,20 +346,20 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.23", + "clap 4.5.11", "criterion-plot", "futures", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -875,7 +879,7 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "harmonizer" -version = "2.8.3" +version = "2.8.4" dependencies = [ "apollo-federation-types", "deno_core", @@ -883,7 +887,7 @@ dependencies = [ "semver 1.0.17", "serde", "serde_json", - "toml_edit 0.19.9", + "toml_edit 0.22.16", "tracing", "which", ] @@ -943,6 +947,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "home" version = "0.5.5" @@ -1025,6 +1035,17 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1253,12 +1274,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "outref" version = "0.5.1" @@ -1793,6 +1808,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8363f19aa1f3b2fc0bc9648fdde59c1074327a6f756fdd502fb1cfeb8179323c" +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + [[package]] name = "serde_v8" version = "0.111.0" @@ -1834,14 +1858,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "indexmap 1.9.2", + "indexmap 2.1.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -1981,7 +2006,7 @@ dependencies = [ [[package]] name = "supergraph" -version = "2.8.3" +version = "2.8.4" dependencies = [ "apollo-federation-types", "camino", @@ -2051,12 +2076,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.56" @@ -2189,11 +2208,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.16", ] [[package]] @@ -2201,6 +2223,9 @@ name = "toml_datetime" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -2224,6 +2249,19 @@ dependencies = [ "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.16", +] + [[package]] name = "tower" version = "0.4.13" @@ -2423,6 +2461,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "url" version = "2.3.1" @@ -2825,6 +2869,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +dependencies = [ + "memchr", +] + [[package]] name = "xattr" version = "1.3.1" @@ -2876,11 +2929,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zip" -version = "0.5.13" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "byteorder", "crc32fast", - "thiserror", + "crossbeam-utils", ] diff --git a/apollo-federation-types/Cargo.toml b/apollo-federation-types/Cargo.toml index 97dfb3e4e..bc2272e34 100644 --- a/apollo-federation-types/Cargo.toml +++ b/apollo-federation-types/Cargo.toml @@ -26,7 +26,7 @@ camino = {version = "1", features = ["serde1"], optional = true} log = {version = "0.4", optional = true} semver = {version = "1", features = ["serde"]} serde_with = {version = "3", default-features = false, features = ["macros"], optional = true} -serde_yaml = {version = "0.8", optional = true} +serde_yaml = {version = "0.9", optional = true} thiserror = {version = "1", optional = true} url = {version = "2", features = ["serde"], optional = true} @@ -37,4 +37,4 @@ serde_json = {version = "1", optional = true} assert_fs = "1" rstest = "0.21.0" serde_json = "1" -serde_yaml = "0.8" +serde_yaml = "0.9" diff --git a/harmonizer/Cargo.toml b/harmonizer/Cargo.toml index 83beb1533..56c8c2225 100644 --- a/harmonizer/Cargo.toml +++ b/harmonizer/Cargo.toml @@ -34,5 +34,5 @@ insta = "1.34.0" deno_core = "0.200.0" semver = "1" serde_json = "1" -toml_edit = "0.19" +toml_edit = "0.22" which = "4.4.2" diff --git a/router-bridge/Cargo.toml b/router-bridge/Cargo.toml index 9f2bf307a..37f8b4a8a 100644 --- a/router-bridge/Cargo.toml +++ b/router-bridge/Cargo.toml @@ -42,7 +42,7 @@ futures = "0.3.29" insta = { version = "1.34.0", features = ["json"] } pretty_assertions = "1.4.0" tracing-test = "0.2.1" -criterion = { version = "0.4", features = ["async_tokio", "async_futures"] } +criterion = { version = "0.5", features = ["async_tokio", "async_futures"] } [build-dependencies] deno_console = "0.115.0" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 0ec19ecbd..933387081 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] ansi_term = "0.12" anyhow = "1" -base64 = "0.13" +base64 = "0.22" flate2 = "1" lazy_static = "1.4" log = "0.4.21" @@ -21,6 +21,6 @@ simple_logger = "5.0.0" structopt = { version = "0.3", default-features = false } tar = "0.4" tempfile = "3.9" -toml = "0.5" +toml = "0.8" which = "4.4" -zip = { version = "0.5", default-features = false } +zip = { version = "0.6", default-features = false }