Merge branch 'master' into update-msrv

Author: elenaf9

docs/coding-guidelines.md

@@ -236,7 +236,7 @@ Concurrency adds complexity. Concurrency adds overhead due to synchronization.
 Thus unless proven to be a bottleneck, don't make things concurrent. As an example
 the hierarchical `NetworkBehaviour` state machine runs sequentially. It is easy
 to debug as it runs sequentially. Thus far there has been no proof that
-shows a speed up when running it concurrently.
+shows a speed-up when running it concurrently.
 
 ## Use `async/await` for sequential execution only
 

libp2p/src/builder/phase.rs

@@ -16,23 +16,22 @@ mod websocket;
 
 use bandwidth_logging::*;
 use bandwidth_metrics::*;
+pub use behaviour::BehaviourError;
 use behaviour::*;
 use build::*;
 use dns::*;
 use libp2p_core::{muxing::StreamMuxerBox, Transport};
 use libp2p_identity::Keypair;
+pub use other_transport::TransportError;
 use other_transport::*;
 use provider::*;
 use quic::*;
 use relay::*;
 use swarm::*;
 use tcp::*;
-use websocket::*;
-
-pub use behaviour::BehaviourError;
-pub use other_transport::TransportError;
 #[cfg(all(not(target_arch = "wasm32"), feature = "websocket"))]
 pub use websocket::WebsocketError;
+use websocket::*;
 
 use super::{
     select_muxer::SelectMuxerUpgrade, select_security::SelectSecurityUpgrade, SwarmBuilder,

protocols/gossipsub/CHANGELOG.md

@@ -246,7 +246,7 @@
 
 - Move from `open-metrics-client` to `prometheus-client` (see [PR 2442]).
 
-- Emit gossip of all non empty topics (see [PR 2481]).
+- Emit gossip of all non-empty topics (see [PR 2481]).
 
 - Merge NetworkBehaviour's inject_\* paired methods (see [PR 2445]).
 

swarm/src/lib.rs

@@ -1497,14 +1497,17 @@ impl Config {
     ///
     /// Defaults to 10s.
     ///
-    /// Typically, you shouldn't _need_ to modify this default as connections will be kept alive whilst they are "in use" (see below).
-    /// Depending on the application's usecase, it may be desirable to keep connections alive despite them not being in use.
+    /// Typically, you shouldn't _need_ to modify this default as connections will be kept alive
+    /// whilst they are "in use" (see below). Depending on the application's usecase, it may be
+    /// desirable to keep connections alive despite them not being in use.
     ///
     /// A connection is considered idle if:
     /// - There are no active inbound streams.
     /// - There are no active outbounds streams.
-    /// - There are no pending outbound streams (i.e. all streams requested via [`ConnectionHandlerEvent::OutboundSubstreamRequest`] have completed).
-    /// - Every [`ConnectionHandler`] returns `false` from [`ConnectionHandler::connection_keep_alive`].
+    /// - There are no pending outbound streams (i.e. all streams requested via
+    ///   [`ConnectionHandlerEvent::OutboundSubstreamRequest`] have completed).
+    /// - Every [`ConnectionHandler`] returns `false` from
+    ///   [`ConnectionHandler::connection_keep_alive`].
     ///
     /// Once all these conditions are true, the idle connection timeout starts ticking.
     pub fn with_idle_connection_timeout(mut self, timeout: Duration) -> Self {

transports/dns/src/lib.rs

@@ -160,7 +160,7 @@ use async_trait::async_trait;
 use futures::{future::BoxFuture, prelude::*};
 pub use hickory_resolver::{
     config::{ResolverConfig, ResolverOpts},
-    {ResolveError, ResolveErrorKind},
+    ResolveError, ResolveErrorKind,
 };
 use hickory_resolver::{
     lookup::{Ipv4Lookup, Ipv6Lookup, TxtLookup},