fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-04-25 19:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Pierre Krieger 2019-12-12 14:10:01 +01:00
commit 21f32da045
No known key found for this signature in database
GPG Key ID: EE749C4F41D4EA47
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Cargo.toml
View File

@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
asn1_der = "0.6.1" asn1_der = "0.6.1"
bs58 = "0.3.0" bs58 = "0.3.0"
bytes = "0.4" bytes = "0.4"
ed25519-dalek = "1.0.0-pre.2" ed25519-dalek = "1.0.0-pre.3"
failure = "0.1" failure = "0.1"
fnv = "1.0" fnv = "1.0"
futures = { version = "0.3.1", features = ["compat", "io-compat", "executor", "thread-pool"] } futures = { version = "0.3.1", features = ["compat", "io-compat", "executor", "thread-pool"] }

2
misc/multistream-select/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "multistream-select" name = "multistream-select"
description = "Multistream-select negotiation protocol for libp2p" description = "Multistream-select negotiation protocol for libp2p"
version = "0.6.0" version = "0.6.1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT" license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p" repository = "https://github.com/libp2p/rust-libp2p"

1
protocols/noise/src/io.rs
View File

@ -427,7 +427,6 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
ready!(self.as_mut().poll_flush(cx))?; ready!(self.as_mut().poll_flush(cx))?;
Pin::new(&mut self.io).poll_close(cx) Pin::new(&mut self.io).poll_close(cx)
} }
} }
/// Read 2 bytes as frame length from the given source into the given buffer. /// Read 2 bytes as frame length from the given source into the given buffer.

2
src/lib.rs
View File

@ -142,7 +142,7 @@
//! [`PublicKey`]: identity::PublicKey //! [`PublicKey`]: identity::PublicKey
//! [`Future`]: futures::Future //! [`Future`]: futures::Future
//! [`TcpConfig`]: tcp::TcpConfig //! [`TcpConfig`]: tcp::TcpConfig
//! [`NetworkBehaviour`]: core::swarm::NetworkBehaviour //! [`NetworkBehaviour`]: swarm::NetworkBehaviour
//! [`StreamMuxer`]: core::muxing::StreamMuxer //! [`StreamMuxer`]: core::muxing::StreamMuxer
//! [`Yamux`]: yamux::Yamux //! [`Yamux`]: yamux::Yamux
//! //!