feat(swarm): remove unused DialError::ConnectionIo variant

misc/metrics/src/swarm.rs

@@ -246,9 +246,6 @@ impl<TBvEv, THandleErr> super::Recorder<libp2p_swarm::SwarmEvent<TBvEv, THandleE
                     libp2p_swarm::DialError::WrongPeerId { .. } => {
                         record(OutgoingConnectionErrorError::WrongPeerId)
                     }
-                    libp2p_swarm::DialError::ConnectionIo(_) => {
-                        record(OutgoingConnectionErrorError::ConnectionIo)
-                    }
                 };
             }
             libp2p_swarm::SwarmEvent::BannedPeer { endpoint, .. } => {
@@ -347,7 +344,6 @@ enum OutgoingConnectionErrorError {
     Aborted,
     InvalidPeerId,
     WrongPeerId,
-    ConnectionIo,
     TransportMultiaddrNotSupported,
     TransportOther,
 }
@@ -364,7 +360,6 @@ enum PendingInboundConnectionError {
     TransportErrorMultiaddrNotSupported,
     TransportErrorOther,
     Aborted,
-    Io,
     ConnectionLimit,
 }
 
@@ -386,7 +381,6 @@ impl From<&libp2p_swarm::PendingInboundConnectionError> for PendingInboundConnec
             libp2p_swarm::PendingInboundConnectionError::Aborted => {
                 PendingInboundConnectionError::Aborted
             }
-            libp2p_swarm::PendingInboundConnectionError::IO(_) => PendingInboundConnectionError::Io,
         }
     }
 }

protocols/kad/src/behaviour.rs

@@ -1936,7 +1936,6 @@ where
             | DialError::InvalidPeerId { .. }
             | DialError::WrongPeerId { .. }
             | DialError::Aborted
-            | DialError::ConnectionIo(_)
             | DialError::Transport(_)
             | DialError::NoAddresses => {
                 if let DialError::Transport(addresses) = error {

swarm/CHANGELOG.md

@@ -23,6 +23,14 @@
   If you have previously set `connection_event_buffer_size` you should re-evaluate what a good size for a _per connection_ buffer is.
   See [PR 3188].
 
+- Remove `PendingConnectionError:::IO` variant.
+  This was never constructed.
+  See [PR 3373].
+
+- Remove `DialError::ConnectionIo` variant.
+  This was never constructed.
+  See [PR 3374].
+
 [PR 3364]: https://github.com/libp2p/rust-libp2p/pull/3364
 [PR 3170]: https://github.com/libp2p/rust-libp2p/pull/3170
 [PR 3134]: https://github.com/libp2p/rust-libp2p/pull/3134
@@ -31,6 +39,8 @@
 [PR 3272]: https://github.com/libp2p/rust-libp2p/pull/3272
 [PR 3327]: https://github.com/libp2p/rust-libp2p/pull/3327
 [PR 3188]: https://github.com/libp2p/rust-libp2p/pull/3188
+[PR 3373]: https://github.com/libp2p/rust-libp2p/pull/3373
+[PR 3374]: https://github.com/libp2p/rust-libp2p/pull/3374
 
 # 0.41.1
 

swarm/src/connection/error.rs

@@ -101,10 +101,6 @@ pub enum PendingConnectionError<TTransErr> {
         obtained: PeerId,
         endpoint: ConnectedPoint,
     },
-
-    /// An I/O error occurred on the connection.
-    // TODO: Eventually this should also be a custom error?
-    IO(io::Error),
 }
 
 impl<T> PendingConnectionError<T> {
@@ -118,7 +114,6 @@ impl<T> PendingConnectionError<T> {
             PendingConnectionError::WrongPeerId { obtained, endpoint } => {
                 PendingConnectionError::WrongPeerId { obtained, endpoint }
             }
-            PendingConnectionError::IO(e) => PendingConnectionError::IO(e),
         }
     }
 }
@@ -129,7 +124,6 @@ where
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            PendingConnectionError::IO(err) => write!(f, "Pending connection: I/O error: {err}"),
             PendingConnectionError::Aborted => write!(f, "Pending connection: Aborted."),
             PendingConnectionError::Transport(err) => {
                 write!(
@@ -156,7 +150,6 @@ where
 {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            PendingConnectionError::IO(err) => Some(err),
             PendingConnectionError::Transport(_) => None,
             PendingConnectionError::WrongPeerId { .. } => None,
             PendingConnectionError::Aborted => None,

swarm/src/lib.rs

@@ -1597,8 +1597,6 @@ pub enum DialError {
         obtained: PeerId,
         endpoint: ConnectedPoint,
     },
-    /// An I/O error occurred on the connection.
-    ConnectionIo(io::Error),
     /// An error occurred while negotiating the transport protocol(s) on a connection.
     Transport(Vec<(Multiaddr, TransportError<io::Error>)>),
 }
@@ -1611,7 +1609,6 @@ impl From<PendingOutboundConnectionError> for DialError {
             PendingConnectionError::WrongPeerId { obtained, endpoint } => {
                 DialError::WrongPeerId { obtained, endpoint }
             }
-            PendingConnectionError::IO(e) => DialError::ConnectionIo(e),
             PendingConnectionError::Transport(e) => DialError::Transport(e),
         }
     }
@@ -1638,10 +1635,6 @@ impl fmt::Display for DialError {
                 f,
                 "Dial error: Unexpected peer ID {obtained} at {endpoint:?}."
             ),
-            DialError::ConnectionIo(e) => write!(
-                f,
-                "Dial error: An I/O error occurred on the connection: {e:?}."
-            ),
             DialError::Transport(errors) => {
                 write!(f, "Failed to negotiate transport protocol(s): [")?;
 
@@ -1679,7 +1672,6 @@ impl error::Error for DialError {
             DialError::Aborted => None,
             DialError::InvalidPeerId { .. } => None,
             DialError::WrongPeerId { .. } => None,
-            DialError::ConnectionIo(_) => None,
             DialError::Transport(_) => None,
         }
     }