Move error type to new mod

Author: Serock3

talpid-wireguard/src/lib.rs

@@ -14,7 +14,6 @@ use std::borrow::Cow;
 use std::env;
 use std::{
     convert::Infallible,
-    io,
     net::IpAddr,
     path::Path,
     pin::Pin,
@@ -68,33 +67,6 @@ type EventCallback = Box<dyn (Fn(TunnelEvent) -> BoxFuture<'static, ()>) + Send
 #[derive(err_derive::Error, Debug)]
 #[error(no_from)]
 pub enum Error {
-    /// Failed to set up routing.
-    #[error(display = "Failed to setup routing")]
-    SetupRoutingError(#[error(source)] talpid_routing::Error),
-
-    /// Failed to set MTU
-    #[error(display = "Failed to detect MTU because every ping was dropped.")]
-    MtuDetectionAllDropped,
-
-    /// Failed to set MTU
-    #[error(display = "Failed to detect MTU because of unexpected ping error.")]
-    MtuDetectionPingError(#[error(source)] surge_ping::SurgeError),
-
-    /// Failed to set MTU
-    #[error(
-        display = "Failed to detect MTU because of an IO error when setting up the ping socket."
-    )]
-    MtuDetectionSetupSocket(#[error(source)] io::Error),
-
-    /// Failed to set MTU
-    #[cfg(target_os = "macos")]
-    #[error(display = "Failed to set buffer size")]
-    MtuSetBufferSize(#[error(source)] nix::Error),
-
-    /// Failed to set MTU on the active tunnel
-    #[error(display = "Failed to set MTU on the active tunnel")]
-    SetMtu(#[error(source)] io::Error),
-
     /// Tunnel timed out
     #[error(display = "Tunnel timed out")]
     TimeoutError,
@@ -103,6 +75,10 @@ pub enum Error {
     #[error(display = "Tunnel failed")]
     TunnelError(#[error(source)] TunnelError),
 
+    /// Failed to set up routing.
+    #[error(display = "Failed to setup routing")]
+    SetupRoutingError(#[error(source)] talpid_routing::Error),
+
     /// Failed to create tunnel obfuscator
     #[error(display = "Failed to create tunnel obfuscator")]
     CreateObfuscatorError(#[error(source)] ObfuscationError),
@@ -994,15 +970,39 @@ impl WireguardMonitor {
 
 #[cfg(not(target_os = "android"))]
 mod mtu_detection {
-    use std::{net::IpAddr, time::Duration};
+    use std::{io, net::IpAddr, time::Duration};
 
     use futures::{future, stream::FuturesUnordered, TryStreamExt};
     use surge_ping::{Client, Config, PingIdentifier, PingSequence, SurgeError};
     use talpid_tunnel::{ICMP_HEADER_SIZE, IPV4_HEADER_SIZE, MIN_IPV4_MTU};
     use tokio_stream::StreamExt;
 
-    use super::Error;
+    #[derive(err_derive::Error, Debug)]
+    #[error(no_from)]
+    pub enum Error {
+        /// Failed to set MTU on the active tunnel
+        #[error(display = "Failed to set MTU on the active tunnel")]
+        SetMtu(#[error(source)] io::Error),
+
+        /// Failed to set MTU
+        #[error(display = "Failed to detect MTU because every ping was dropped.")]
+        MtuDetectionAllDropped,
 
+        /// Failed to set MTU
+        #[error(display = "Failed to detect MTU because of unexpected ping error.")]
+        MtuDetectionPing(#[error(source)] surge_ping::SurgeError),
+
+        /// Failed to set MTU
+        #[error(
+            display = "Failed to detect MTU because of an IO error when setting up the ping socket."
+        )]
+        MtuDetectionSetupSocket(#[error(source)] io::Error),
+
+        /// Failed to set MTU
+        #[cfg(target_os = "macos")]
+        #[error(display = "Failed to set buffer size")]
+        MtuSetBufferSize(#[error(source)] nix::Error),
+    }
     /// Verify that the current MTU doesn't cause dropped packets, otherwise lower it to the
     /// largest value which doesn't.
     ///
@@ -1117,15 +1117,15 @@ mod mtu_detection {
                 // If the first ping we get back timed out, then all of them did
                 SurgeError::Timeout { .. } => Error::MtuDetectionAllDropped,
                 // Unexpected error type
-                e => Error::MtuDetectionPingError(e),
+                e => Error::MtuDetectionPing(e),
             })?;
 
         ping_stream
             .timeout(PING_OFFSET_TIMEOUT) // Start a new, shorter, timeout
             .map_while(|res| res.ok()) // Stop waiting for pings after this timeout
             .try_fold(first_ping_size, |acc, mtu| future::ready(Ok(acc.max(mtu)))) // Get largest ping
             .await
-            .map_err(Error::MtuDetectionPingError)
+            .map_err(Error::MtuDetectionPing)
     }
 
     /// Creates a linear spacing of MTU values with the given step size. Always includes the given