diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f77c5f10eed..d28e7ddf84a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,9 +85,9 @@ jobs: - name: Install nightly Rust # TODO: intra-doc links are available on nightly only # see https://doc.rust-lang.org/nightly/rustdoc/lints.html#intra_doc_link_resolution_failure - run: rustup default nightly-2020-05-20 + run: rustup default nightly-2020-09-17 - name: Check rustdoc links - run: RUSTDOCFLAGS="--deny intra_doc_link_resolution_failure" cargo doc --verbose --workspace --no-deps --document-private-items + run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items integration-test: name: Integration tests diff --git a/Cargo.toml b/Cargo.toml index 534047df739..7e73d44ab39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ secp256k1 = ["libp2p-core/secp256k1"] all-features = true [dependencies] -atomic = "0.4.6" +atomic = "0.5.0" bytes = "0.5" futures = "0.3.1" lazy_static = "1.2" diff --git a/core/src/connection/pool.rs b/core/src/connection/pool.rs index e27fde27ec6..379a75be010 100644 --- a/core/src/connection/pool.rs +++ b/core/src/connection/pool.rs @@ -750,7 +750,7 @@ pub enum PoolConnection<'a, TInEvent, TConnInfo, TPeerId> { Established(EstablishedConnection<'a, TInEvent, TConnInfo>), } -/// A pending connection in a [`Pool`]. +/// A pending connection in a pool. pub struct PendingConnection<'a, TInEvent, TConnInfo, TPeerId> { entry: manager::PendingEntry<'a, TInEvent, TConnInfo>, pending: &'a mut FnvHashMap)>, @@ -781,7 +781,7 @@ impl } } -/// An established connection in a [`Pool`]. +/// An established connection in a pool. pub struct EstablishedConnection<'a, TInEvent, TConnInfo> { entry: manager::EstablishedEntry<'a, TInEvent, TConnInfo>, } @@ -861,7 +861,7 @@ where } } -/// An iterator over established connections in a [`Pool`]. +/// An iterator over established connections in a pool. pub struct EstablishedConnectionIter<'a, I, TInEvent, TOutEvent, THandler, TTransErr, THandlerErr, TConnInfo, TPeerId> { pool: &'a mut Pool, ids: I diff --git a/misc/multistream-select/src/dialer_select.rs b/misc/multistream-select/src/dialer_select.rs index e0c03c73a12..87149a6aa9c 100644 --- a/misc/multistream-select/src/dialer_select.rs +++ b/misc/multistream-select/src/dialer_select.rs @@ -34,12 +34,11 @@ use std::{convert::TryFrom as _, io, iter, mem, pin::Pin, task::{Context, Poll}} /// returned `Future` resolves with the name of the negotiated protocol and /// a [`Negotiated`] I/O stream. /// -/// The chosen message flow for protocol negotiation depends on the numbers -/// of supported protocols given. That is, this function delegates to -/// [`dialer_select_proto_serial`] or [`dialer_select_proto_parallel`] -/// based on the number of protocols given. The number of protocols is -/// determined through the `size_hint` of the given iterator and thus -/// an inaccurate size estimate may result in a suboptimal choice. +/// The chosen message flow for protocol negotiation depends on the numbers of +/// supported protocols given. That is, this function delegates to serial or +/// parallel variant based on the number of protocols given. The number of +/// protocols is determined through the `size_hint` of the given iterator and +/// thus an inaccurate size estimate may result in a suboptimal choice. /// /// Within the scope of this library, a dialer always commits to a specific /// multistream-select protocol [`Version`], whereas a listener always supports @@ -401,4 +400,3 @@ where } } } -