diff --git a/Cargo.lock b/Cargo.lock index 778d3827..67415824 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -491,7 +491,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools 0.9.0", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -513,7 +513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" dependencies = [ "cast", - "itertools 0.9.0", + "itertools", ] [[package]] @@ -1281,8 +1281,8 @@ dependencies = [ "multibase", "multihash 0.11.4", "once_cell", - "prost 0.6.1", - "prost-build 0.6.1", + "prost", + "prost-build", "rand", "serde", "serde_json", @@ -1310,10 +1310,10 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "multihash 0.11.4", - "prost 0.6.1", - "prost-build 0.6.1", + "prost", + "prost-build", "thiserror", - "tokio 0.3.6", + "tokio 1.0.1", "tracing", "unsigned-varint 0.3.3", ] @@ -1336,8 +1336,8 @@ dependencies = [ "multihash 0.11.4", "openssl", "percent-encoding", - "prost 0.6.1", - "prost-build 0.6.1", + "prost", + "prost-build", "serde", "serde_json", "structopt", @@ -1376,15 +1376,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.9.0" @@ -1475,8 +1466,8 @@ dependencies = [ "parity-multiaddr", "parking_lot", "pin-project 1.0.4", - "prost 0.7.0", - "prost-build 0.7.0", + "prost", + "prost-build", "rand", "ring", "rw-stream-sink", @@ -1518,8 +1509,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", - "prost-build 0.7.0", + "prost", + "prost-build", "rand", "smallvec", ] @@ -1533,8 +1524,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", - "prost-build 0.7.0", + "prost", + "prost-build", "smallvec", "wasm-timer", ] @@ -1553,8 +1544,8 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", - "prost-build 0.7.0", + "prost", + "prost-build", "rand", "sha2 0.9.1", "smallvec", @@ -1592,8 +1583,8 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost 0.7.0", - "prost-build 0.7.0", + "prost", + "prost-build", "rand", "sha2 0.9.1", "snow", @@ -2206,16 +2197,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "prost" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" -dependencies = [ - "bytes 0.5.6", - "prost-derive 0.6.1", -] - [[package]] name = "prost" version = "0.7.0" @@ -2223,25 +2204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ "bytes 1.0.1", - "prost-derive 0.7.0", -] - -[[package]] -name = "prost-build" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" -dependencies = [ - "bytes 0.5.6", - "heck", - "itertools 0.8.2", - "log", - "multimap", - "petgraph", - "prost 0.6.1", - "prost-types 0.6.1", - "tempfile", - "which 3.1.1", + "prost-derive", ] [[package]] @@ -2252,27 +2215,14 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes 1.0.1", "heck", - "itertools 0.9.0", + "itertools", "log", "multimap", "petgraph", - "prost 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-types", "tempfile", - "which 4.0.2", -] - -[[package]] -name = "prost-derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" -dependencies = [ - "anyhow", - "itertools 0.8.2", - "proc-macro2", - "quote", - "syn", + "which", ] [[package]] @@ -2282,22 +2232,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools 0.9.0", + "itertools", "proc-macro2", "quote", "syn", ] -[[package]] -name = "prost-types" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" -dependencies = [ - "bytes 0.5.6", - "prost 0.6.1", -] - [[package]] name = "prost-types" version = "0.7.0" @@ -2305,7 +2245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ "bytes 1.0.1", - "prost 0.7.0", + "prost", ] [[package]] @@ -3364,15 +3304,6 @@ dependencies = [ "cc", ] -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "which" version = "4.0.2" diff --git a/Cargo.toml b/Cargo.toml index 484095b5..b12ba868 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ ipfs-unixfs = { version = "0.2", path = "unixfs" } libp2p = { default-features = false, features = ["floodsub", "identify", "kad", "tcp-tokio", "mplex", "noise", "ping", "yamux", "dns"], git = "https://github.com/libp2p/rust-libp2p.git" } multibase = { default-features = false, version = "0.8" } multihash = { default-features = false, version = "0.11" } -prost = { default-features = false, version = "0.6" } +prost = { default-features = false, version = "0.7" } rand = { default-features = false, version = "0.7" } serde = { default-features = false, features = ["derive"], version = "1.0" } serde_json = { default-features = false, features = ["std"], version = "1.0" } @@ -55,7 +55,7 @@ once_cell = "1.5.2" ipconfig = { default-features = false, version = "0.2" } [build-dependencies] -prost-build = { default-features = false, version = "0.6" } +prost-build = { default-features = false, version = "0.7" } [dev-dependencies] hex-literal = { default-features = false, version = "0.3" } diff --git a/bitswap/Cargo.toml b/bitswap/Cargo.toml index 483382f9..f46dc8ff 100644 --- a/bitswap/Cargo.toml +++ b/bitswap/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/rs-ipfs/rust-ipfs" [build-dependencies] -prost-build = { default-features = false, version = "0.6" } +prost-build = { default-features = false, version = "0.7" } [dependencies] cid = { default-features = false, version = "0.5" } @@ -17,7 +17,7 @@ futures = { default-features = false, version = "0.3" } libp2p-core = { default-features = false, git = "https://github.com/libp2p/rust-libp2p.git" } libp2p-swarm = { default-features = false, git = "https://github.com/libp2p/rust-libp2p.git" } multihash = { default-features = false, version = "0.11" } -prost = { default-features = false, version = "0.6" } +prost = { default-features = false, version = "0.7" } thiserror = { default-features = false, version = "1.0" } tokio = { default-features = false, version = "1", features = ["rt"] } tracing = { default-features = false, version = "0.1" } diff --git a/http/Cargo.toml b/http/Cargo.toml index 911a615b..3e635b8d 100644 --- a/http/Cargo.toml +++ b/http/Cargo.toml @@ -6,7 +6,7 @@ name = "ipfs-http" version = "0.1.0" [build-dependencies] -prost-build = { default-features = false, version = "0.6" } +prost-build = { default-features = false, version = "0.7" } vergen = { default-features = false, version = "3.1" } [dependencies] @@ -24,7 +24,7 @@ multihash = { default-features = false, version = "0.11" } # openssl is required for rsa keygen but not used by the rust-ipfs or its dependencies openssl = { default-features = false, version = "0.10" } percent-encoding = { default-features = false, version = "2.1" } -prost = { default-features = false, version = "0.6.1" } +prost = { default-features = false, version = "0.7" } serde = { default-features = false, features = ["derive"], version = "1.0" } serde_json = { default-features = false, version = "1.0" } structopt = { default-features = false, version = "0.3" }