Skip to content

Commit 563756d

Browse files
authored
Merge branch 'master' into dependabot/cargo/prometheus-client-0.25.0
2 parents 9489fd6 + 5a133a0 commit 563756d

47 files changed

Lines changed: 1384 additions & 648 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 229 additions & 153 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ criterion = { version = "0.5.1" }
125125
bytes = "1.11.1"
126126
env_logger = "0.11"
127127
futures = "0.3.30"
128-
futures-bounded = { version = "0.3", features = ["tokio"] }
128+
futures-bounded = { version = "0.3", features = ["futures-timer"] }
129129
futures-rustls = { version = "0.26.0", default-features = false }
130130
futures-timer = "3.0"
131131
hex-literal = "0.4"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,4 @@ used by [Polkadot](https://www.parity.io/technologies/polkadot/).
108108
- [Taple](https://github.com/opencanarias/taple-core) - Sustainable DLT for asset and process traceability by [OpenCanarias](https://www.opencanarias.com/en/).
109109
- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framework.
110110
- [Fungi](https://github.com/enbop/fungi) - A platform built for seamless multi-device integration.
111+
- [Kinetic](https://github.com/saifmukhtar/kinetic) - Stateless, Sybil-resistant naming system with permanent identities using VDFs and drand.

interop-tests/Dockerfile.chromium

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.5-labs
22
FROM rust:1.88 as chef
33
RUN rustup target add wasm32-unknown-unknown
4-
RUN wget -q -O- https://github.com/drager/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -zx -C /usr/local/bin --strip-components 1 --wildcards "wasm-pack-*/wasm-pack"
4+
RUN wget -q -O- https://github.com/wasm-bindgen/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -zx -C /usr/local/bin --strip-components 1 --wildcards "wasm-pack-*/wasm-pack"
55
RUN wget -q -O- https://github.com/WebAssembly/binaryen/releases/download/version_115/binaryen-version_115-x86_64-linux.tar.gz | tar -zx -C /usr/local/bin --strip-components 2 --wildcards "binaryen-version_*/bin/wasm-opt"
66
RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
77
WORKDIR /app

muxers/yamux/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## 0.48.0
22

3+
- Remove yamux v0.12 support and its already deprecated methods.
4+
Update yamux dependency to v0.14, removing the `rand` runtime dependency.
5+
See [PR #6493](https://github.com/libp2p/rust-yamux/pull/6493).
6+
37
- Raise MSRV to 1.88.0.
48
See [PR 6273](https://github.com/libp2p/rust-libp2p/pull/6273).
59

muxers/yamux/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
1111
categories = ["network-programming", "asynchronous"]
1212

1313
[dependencies]
14-
either = "1"
1514
futures = { workspace = true }
1615
libp2p-core = { workspace = true }
1716
thiserror = { workspace = true }
18-
yamux012 = { version = "0.12.1", package = "yamux" }
19-
yamux013 = { version = "0.13.3", package = "yamux" }
17+
yamux = { version = "0.14" }
2018
tracing = { workspace = true }
2119

2220
[dev-dependencies]

0 commit comments

Comments
 (0)