fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-29 01:31:33 +00:00
Code Issues Projects Releases Wiki Activity

deps: bump futures from 0.3.25 to 0.3.26 (#3405)

Browse Source
This commit is contained in:
dependabot[bot]
2023-01-31 23:34:17 +00:00
committed by GitHub
parent 8f3b7e3876
commit 0c94237e16
31 changed files with 67 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Cargo.lock generated
View File

@ -1463,9 +1463,9 @@ dependencies = [
[[package]]
name = "futures"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
dependencies = [
"futures-channel",
"futures-core",
@ -1478,9 +1478,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
dependencies = [
"futures-core",
"futures-sink",
@ -1488,15 +1488,15 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
[[package]]
name = "futures-executor"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
dependencies = [
"futures-core",
"futures-task",
@ -1506,9 +1506,9 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
[[package]]
name = "futures-lite"
@ -1527,9 +1527,9 @@ dependencies = [
[[package]]
name = "futures-macro"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
dependencies = [
"proc-macro2",
"quote",
@ -1549,15 +1549,15 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
[[package]]
name = "futures-task"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
[[package]]
name = "futures-timer"
@ -1571,9 +1571,9 @@ dependencies = [
[[package]]
name = "futures-util"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
dependencies = [
"futures-channel",
"futures-core",
@ -1916,6 +1916,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "if-addrs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b24dd0826eee92c56edcda7ff190f2cf52115c49eadb2c2da8063e2673a8c2"
dependencies = [
"libc",
"windows-sys",
]
[[package]]
name = "if-watch"
version = "3.0.0"
@ -1926,7 +1936,7 @@ dependencies = [
"core-foundation",
"fnv",
"futures",
"if-addrs",
"if-addrs 0.7.0",
"ipnet",
"log",
"rtnetlink",
@ -1995,7 +2005,7 @@ dependencies = [
"either",
"env_logger 0.9.3",
"futures",
"if-addrs",
"if-addrs 0.8.0",
"libp2p",
"log",
"rand 0.8.5",
@ -2838,14 +2848,17 @@ dependencies = [
name = "libp2p-websocket"
version = "0.41.0"
dependencies = [
"async-std",
"either",
"futures",
"futures-rustls",
"libp2p-core",
"libp2p-dns",
"libp2p-tcp",
"log",
"parking_lot 0.12.1",
"quicksink",
"rcgen 0.9.3",
"rw-stream-sink",
"soketto",
"url",

2
Cargo.toml
View File

@ -87,7 +87,7 @@ yamux = ["dep:libp2p-yamux"]
[dependencies]
bytes = "1"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
getrandom = "0.2.3" # Explicit dependency to be used in `wasm-bindgen` feature
instant = "0.1.11" # Explicit dependency to be used in `wasm-bindgen` feature

2
core/Cargo.toml
View File

@ -16,7 +16,7 @@ bs58 = "0.4.0"
ed25519-dalek = "1.0.1"
either = "1.5"
fnv = "1.0"
futures = { version = "0.3.1", features = ["executor", "thread-pool"] }
futures = { version = "0.3.26", features = ["executor", "thread-pool"] }
futures-timer = "3"
instant = "0.1.11"
libsecp256k1 = { version = "0.7.0", optional = true }

30
core/src/either.rs
View File

@ -41,7 +41,7 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<Self::Substream, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner
.poll_inbound(cx)
.map_ok(future::Either::Left)
@ -57,7 +57,7 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<Self::Substream, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner
.poll_outbound(cx)
.map_ok(future::Either::Left)
@ -70,7 +70,7 @@ where
}
fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner.poll_close(cx).map_err(Either::Left),
future::Either::Right(inner) => inner.poll_close(cx).map_err(Either::Right),
}
@ -80,35 +80,13 @@ where
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Result<StreamMuxerEvent, Self::Error>> {
match as_pin_mut(self) {
match self.as_pin_mut() {
future::Either::Left(inner) => inner.poll(cx).map_err(Either::Left),
future::Either::Right(inner) => inner.poll(cx).map_err(Either::Right),
}
}
}
/// Convert `Pin<&mut Either<A, B>>` to `Either<Pin<&mut A>, Pin<&mut B>>`,
/// pinned projections of the inner variants.
///
/// Local function until <https://github.com/rust-lang/futures-rs/pull/2691> is merged.
fn as_pin_mut<A, B>(
either: Pin<&mut future::Either<A, B>>,
) -> future::Either<Pin<&mut A>, Pin<&mut B>> {
// SAFETY: `get_unchecked_mut` is fine because we don't move anything.
// We can use `new_unchecked` because the `inner` parts are guaranteed
// to be pinned, as they come from `self` which is pinned, and we never
// offer an unpinned `&mut L` or `&mut R` through `Pin<&mut Self>`. We
// also don't have an implementation of `Drop`, nor manual `Unpin`.
unsafe {
match *Pin::get_unchecked_mut(either) {
future::Either::Left(ref mut inner) => future::Either::Left(Pin::new_unchecked(inner)),
future::Either::Right(ref mut inner) => {
future::Either::Right(Pin::new_unchecked(inner))
}
}
}
}
/// Implements `Future` and dispatches all method calls to either `First` or `Second`.
#[pin_project(project = EitherFutureProj)]
#[derive(Debug, Copy, Clone)]

2
interop-tests/Cargo.toml
View File

@ -9,7 +9,7 @@ anyhow = "1"
async-trait = "0.1.58"
either = "1.8.0"
env_logger = "0.9.0"
futures = "0.3.1"
futures = "0.3.26"
if-addrs = "0.8.0"
libp2p = { path = "../", default_features = false, features = ["websocket", "quic", "mplex", "yamux", "tcp", "tokio", "ping", "noise", "tls", "dns", "rsa", "macros", "webrtc"] }
log = "0.4"

2
misc/metrics/Cargo.toml
View File

@ -33,7 +33,7 @@ libp2p-gossipsub = { version = "0.44.0", path = "../../protocols/gossipsub", op
[dev-dependencies]
env_logger = "0.10.0"
futures = "0.3.1"
futures = "0.3.26"
hyper = { version="0.14", features = ["server", "tcp", "http1"] }
libp2p-noise = { path = "../../transports/noise" }
libp2p-ping = { path = "../../protocols/ping" }

2
misc/rw-stream-sink/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["networking"]
categories = ["network-programming", "asynchronous"]
[dependencies]
futures = "0.3.1"
futures = "0.3.26"
pin-project = "1.0.10"
static_assertions = "1"

2
muxers/mplex/Cargo.toml
View File

@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
bytes = "1"
futures = "0.3.1"
futures = "0.3.26"
asynchronous-codec = "0.6"
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4"

2
muxers/test-harness/Cargo.toml
View File

@ -9,6 +9,6 @@ license = "MIT"
[dependencies]
libp2p-core = { path = "../../core" }
futures = "0.3.24"
futures = "0.3.26"
log = "0.4"
futures-timer = "3.0.2"

2
muxers/yamux/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]
[dependencies]
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
parking_lot = "0.12"
thiserror = "1.0"

2
protocols/dcutr/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = "0.6"
bytes = "1"
either = "1.6.0"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3.0"
instant = "0.1.11"
libp2p-core = { version = "0.39.0", path = "../../core" }

2
protocols/floodsub/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = "0.6"
cuckoofilter = "0.5.0"
fnv = "1.0"
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }
log = "0.4"

2
protocols/gossipsub/Cargo.toml
View File

@ -16,7 +16,7 @@ libp2p-core = { version = "0.39.0", path = "../../core" }
bytes = "1.0"
byteorder = "1.3.4"
fnv = "1.0.7"
futures = "0.3.5"
futures = "0.3.26"
rand = "0.8"
asynchronous-codec = "0.6"
unsigned-varint = { version = "0.7.0", features = ["asynchronous_codec"] }

2
protocols/identify/Cargo.toml
View File

@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
asynchronous-codec = "0.6"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3.0.2"
libp2p-core = { version = "0.39.0", path = "../../core" }
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }

2
protocols/kad/Cargo.toml
View File

@ -16,7 +16,7 @@ bytes = "1"
either = "1.5"
fnv = "1.0"
asynchronous-codec = "0.6"
futures = "0.3.1"
futures = "0.3.26"
log = "0.4"
libp2p-core = { version = "0.39.0", path = "../../core" }
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }

2
protocols/mdns/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-io = { version = "1.3.1", optional = true }
data-encoding = "2.3.2"
futures = "0.3.13"
futures = "0.3.26"
if-watch = "3.0.0"
libp2p-core = { version = "0.39.0", path = "../../core" }
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }

2
protocols/ping/Cargo.toml
View File

@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
either = "1.8.0"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3.0.2"
instant = "0.1.11"
libp2p-core = { version = "0.39.0", path = "../../core" }

2
protocols/relay/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = "0.6"
bytes = "1"
either = "1.6.0"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3"
instant = "0.1.11"
libp2p-core = { version = "0.39.0", path = "../../core" }

2
protocols/request-response/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-trait = "0.1"
bytes = "1"
futures = "0.3.1"
futures = "0.3.26"
instant = "0.1.11"
libp2p-core = { version = "0.39.0", path = "../../core" }
libp2p-swarm = { version = "0.42.0", path = "../../swarm" }

4
swarm/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
either = "1.6.0"
fnv = "1.0"
futures = "0.3.1"
futures = "0.3.26"
futures-timer = "3.0.2"
instant = "0.1.11"
libp2p-core = { version = "0.39.0", path = "../core" }
@ -41,7 +41,7 @@ wasm-bindgen = ["dep:wasm-bindgen-futures", "dep:getrandom"]
async-std = { version = "1.6.2", features = ["attributes"] }
either = "1.6.0"
env_logger = "0.10"
futures = "0.3.1"
futures = "0.3.26"
libp2p-identify = { path = "../protocols/identify" }
libp2p-kad = { path = "../protocols/kad" }
libp2p-ping = { path = "../protocols/ping" }

2
transports/deflate/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]
[dependencies]
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
flate2 = "1.0"

2
transports/dns/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4.1"
futures = "0.3.1"
futures = "0.3.26"
async-std-resolver = { version = "0.22", optional = true }
parking_lot = "0.12.0"
trust-dns-resolver = { version = "0.22", default-features = false, features = ["system-config"] }

2
transports/noise/Cargo.toml
View File

@ -11,7 +11,7 @@ repository = "https://github.com/libp2p/rust-libp2p"
[dependencies]
bytes = "1"
curve25519-dalek = "3.0.0"
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4"
once_cell = "1.16.0"

2
transports/plaintext/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
asynchronous-codec = "0.6"
bytes = "1"
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4.8"
prost = "0.11"

2
transports/pnet/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]
[dependencies]
futures = "0.3.1"
futures = "0.3.26"
log = "0.4.8"
salsa20 = "0.10"
sha3 = "0.10"

2
transports/quic/Cargo.toml
View File

@ -11,7 +11,7 @@ license = "MIT"
[dependencies]
async-std = { version = "1.12.0", optional = true }
bytes = "1.2.1"
futures = "0.3.15"
futures = "0.3.26"
futures-timer = "3.0.2"
if-watch = "3.0.0"
libp2p-core = { version = "0.39.0", path = "../../core" }

2
transports/tcp/Cargo.toml
View File

@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-io = { version = "1.2.0", optional = true }
futures = "0.3.8"
futures = "0.3.26"
futures-timer = "3.0"
if-watch = "3.0.0"
libc = "0.2.80"

2
transports/tls/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "MIT"
exclude = ["src/test_assets"]
[dependencies]
futures = { version = "0.3.24", default-features = false }
futures = { version = "0.3.26", default-features = false }
futures-rustls = "0.22.2"
libp2p-core = { version = "0.39.0", path = "../../core" }
rcgen = "0.10.0"

2
transports/uds/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
async-std = { version = "1.6.2", optional = true }
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4.1"
futures = "0.3.1"
futures = "0.3.26"
tokio = { version = "1.15", default-features = false, features = ["net"], optional = true }
[target.'cfg(all(unix, not(target_os = "emscripten")))'.dev-dependencies]

2
transports/wasm-ext/Cargo.toml
View File

@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]
[dependencies]
futures = "0.3.1"
futures = "0.3.26"
js-sys = "0.3.50"
libp2p-core = { version = "0.39.0", path = "../../core" }
parity-send-wrapper = "0.1.0"

2
transports/websocket/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
futures-rustls = "0.22"
either = "1.5.3"
futures = "0.3.1"
futures = "0.3.26"
libp2p-core = { version = "0.39.0", path = "../../core" }
log = "0.4.8"
parking_lot = "0.12.0"