diff --git a/Cargo.lock b/Cargo.lock index 5fe0549d4d6..6cbb302f3b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,9 +34,9 @@ source = "git+https://github.com/yaahc/abscissa.git?rev=41d342a9344e38442b2211b0 dependencies = [ "darling", "ident_case", - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", "synstructure", ] @@ -465,7 +465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227" dependencies = [ "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -500,10 +500,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", "strsim 0.9.3", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -514,7 +514,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -561,9 +561,9 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc2ab4d5a16117f9029e9a6b5e4e79f4c67f6519bc134210d4d4a04ba31f41b" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -666,9 +666,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" dependencies = [ "futures-channel", "futures-core", @@ -681,9 +681,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", "futures-sink", @@ -691,15 +691,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" dependencies = [ "futures-core", "futures-task", @@ -708,43 +708,42 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" dependencies = [ + "autocfg", "proc-macro-hack", - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -dependencies = [ - "once_cell", -] +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ + "autocfg", "futures-channel", "futures-core", "futures-io", @@ -752,7 +751,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -828,9 +827,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90454ce4de40b7ca6a8968b5ef367bdab48413962588d0d2b1638d60090c35d7" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -1398,9 +1397,9 @@ version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -1409,6 +1408,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + [[package]] name = "pin-utils" version = "0.1.0" @@ -1428,9 +1433,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", "version_check", ] @@ -1440,18 +1445,18 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", "syn-mid", "version_check", ] [[package]] name = "proc-macro-hack" -version = "0.5.16" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -1470,9 +1475,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid 0.2.1", ] @@ -1541,7 +1546,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", ] [[package]] @@ -1832,9 +1837,9 @@ version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -1968,9 +1973,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5254766110c377a921c002ca0775d4e384ba69af951fc4329d9dd77af2c25763" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2004,9 +2009,9 @@ checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2028,11 +2033,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.35" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -2043,9 +2048,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2054,9 +2059,9 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", "unicode-xid 0.2.1", ] @@ -2117,9 +2122,9 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2158,7 +2163,7 @@ dependencies = [ "mio-named-pipes", "mio-uds", "num_cpus", - "pin-project-lite", + "pin-project-lite 0.1.7", "signal-hook-registry", "slab", "tokio-macros", @@ -2172,9 +2177,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2187,7 +2192,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite", + "pin-project-lite 0.1.7", "tokio", ] @@ -2201,7 +2206,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite", + "pin-project-lite 0.1.7", "tokio", ] @@ -2394,9 +2399,9 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", ] [[package]] @@ -2813,8 +2818,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ - "proc-macro2 1.0.19", + "proc-macro2 1.0.28", "quote 1.0.7", - "syn 1.0.35", + "syn 1.0.74", "synstructure", ] diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml index a4247eee1ae..79a7301042f 100644 --- a/tower-batch/Cargo.toml +++ b/tower-batch/Cargo.toml @@ -12,7 +12,7 @@ futures-core = "0.3.5" pin-project = "0.4.23" tracing = "0.1.17" tracing-futures = "0.2.4" -futures = "0.3.5" +futures = "0.3.16" [dev-dependencies] ed25519-zebra = "2.1.0" diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 08eabb152d0..6518bee4d50 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -12,7 +12,7 @@ rand = "0.7" redjubjub = "0.2" metrics = "0.12" -futures = "0.3.5" +futures = "0.3.16" futures-util = "0.3.5" tokio = { version = "0.2.22", features = ["time", "sync", "stream", "tracing"] } tower = "0.3" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index e6a724f8c08..7481589f4ea 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -17,7 +17,7 @@ lazy_static = "1.4.0" serde = { version = "1", features = ["serde_derive"] } sled = "0.34.0" -futures = "0.3.5" +futures = "0.3.16" tower = "0.3.1" tracing = "0.1" tracing-futures = "0.2" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 916741b61de..d420b7d3537 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" hex = "0.4.2" lazy_static = "1.4.0" tower = "0.3.1" -futures = "0.3.5" +futures = "0.3.16" color-eyre = "0.5" tracing = "0.1.17" tracing-subscriber = "0.2.9"