Skip to content

Commit 3c72b07

Browse files
Update atomic requirement from 0.4.6 to 0.5.0 (#1766)
* Update atomic requirement from 0.4.6 to 0.5.0 Updates the requirements on [atomic](https://github.com/Amanieu/atomic-rs) to permit the latest version. - [Release notes](https://github.com/Amanieu/atomic-rs/releases) - [Commits](Amanieu/atomic-rs@v0.4.6...v0.5.0) Signed-off-by: dependabot[bot] <[email protected]> * .github/workflows: Update Rust nightly * misc/multistream-select: Don't mention private item in public doc * .github/workflows: Update renamed doc flag * core/src/connection/pool: Don't mention private item in public doc Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Inden <[email protected]>
1 parent 5099ab5 commit 3c72b07

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ jobs:
8585
- name: Install nightly Rust
8686
# TODO: intra-doc links are available on nightly only
8787
# see https://doc.rust-lang.org/nightly/rustdoc/lints.html#intra_doc_link_resolution_failure
88-
run: rustup default nightly-2020-05-20
88+
run: rustup default nightly-2020-09-17
8989
- name: Check rustdoc links
90-
run: RUSTDOCFLAGS="--deny intra_doc_link_resolution_failure" cargo doc --verbose --workspace --no-deps --document-private-items
90+
run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items
9191

9292
integration-test:
9393
name: Integration tests

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ secp256k1 = ["libp2p-core/secp256k1"]
5858
all-features = true
5959

6060
[dependencies]
61-
atomic = "0.4.6"
61+
atomic = "0.5.0"
6262
bytes = "0.5"
6363
futures = "0.3.1"
6464
lazy_static = "1.2"

core/src/connection/pool.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ pub enum PoolConnection<'a, TInEvent, TConnInfo, TPeerId> {
750750
Established(EstablishedConnection<'a, TInEvent, TConnInfo>),
751751
}
752752

753-
/// A pending connection in a [`Pool`].
753+
/// A pending connection in a pool.
754754
pub struct PendingConnection<'a, TInEvent, TConnInfo, TPeerId> {
755755
entry: manager::PendingEntry<'a, TInEvent, TConnInfo>,
756756
pending: &'a mut FnvHashMap<ConnectionId, (ConnectedPoint, Option<TPeerId>)>,
@@ -781,7 +781,7 @@ impl<TInEvent, TConnInfo, TPeerId>
781781
}
782782
}
783783

784-
/// An established connection in a [`Pool`].
784+
/// An established connection in a pool.
785785
pub struct EstablishedConnection<'a, TInEvent, TConnInfo> {
786786
entry: manager::EstablishedEntry<'a, TInEvent, TConnInfo>,
787787
}
@@ -861,7 +861,7 @@ where
861861
}
862862
}
863863

864-
/// An iterator over established connections in a [`Pool`].
864+
/// An iterator over established connections in a pool.
865865
pub struct EstablishedConnectionIter<'a, I, TInEvent, TOutEvent, THandler, TTransErr, THandlerErr, TConnInfo, TPeerId> {
866866
pool: &'a mut Pool<TInEvent, TOutEvent, THandler, TTransErr, THandlerErr, TConnInfo, TPeerId>,
867867
ids: I

misc/multistream-select/src/dialer_select.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ use std::{convert::TryFrom as _, io, iter, mem, pin::Pin, task::{Context, Poll}}
3434
/// returned `Future` resolves with the name of the negotiated protocol and
3535
/// a [`Negotiated`] I/O stream.
3636
///
37-
/// The chosen message flow for protocol negotiation depends on the numbers
38-
/// of supported protocols given. That is, this function delegates to
39-
/// [`dialer_select_proto_serial`] or [`dialer_select_proto_parallel`]
40-
/// based on the number of protocols given. The number of protocols is
41-
/// determined through the `size_hint` of the given iterator and thus
42-
/// an inaccurate size estimate may result in a suboptimal choice.
37+
/// The chosen message flow for protocol negotiation depends on the numbers of
38+
/// supported protocols given. That is, this function delegates to serial or
39+
/// parallel variant based on the number of protocols given. The number of
40+
/// protocols is determined through the `size_hint` of the given iterator and
41+
/// thus an inaccurate size estimate may result in a suboptimal choice.
4342
///
4443
/// Within the scope of this library, a dialer always commits to a specific
4544
/// multistream-select protocol [`Version`], whereas a listener always supports
@@ -401,4 +400,3 @@ where
401400
}
402401
}
403402
}
404-

0 commit comments

Comments
 (0)