[autofix.ci] apply automated fixes

src/network/task.rs

@@ -3,7 +3,10 @@ use std::fmt;
 use anyhow::Result;
 
 use std::time::Duration;
-use tokio::sync::{mpsc, mpsc::{Permit, Receiver, Sender, UnboundedReceiver}};
+use tokio::sync::{
+    mpsc,
+    mpsc::{Permit, Receiver, Sender, UnboundedReceiver},
+};
 use tokio::task::JoinHandle;
 
 use crate::messages::{NetworkCommand, NetworkEvent, TransportCommand, TransportEvent};

src/network/tests.rs

@@ -1,21 +1,21 @@
 use std::net::{Ipv6Addr, SocketAddr};
 
+use super::task::NetworkTask;
+use crate::messages::{
+    NetworkCommand, NetworkEvent, SmolPacket, TransportCommand, TransportEvent, TunnelInfo,
+};
+use crate::shutdown;
 use anyhow::{anyhow, Result};
 use internet_packet::InternetPacket;
 use smoltcp::{phy::ChecksumCapabilities, wire::*};
+use tokio::sync::watch;
 use tokio::{
     sync::{
         mpsc::{channel, unbounded_channel, Receiver, Sender, UnboundedSender},
         oneshot,
     },
     task::JoinHandle,
 };
-use tokio::sync::watch;
-use crate::messages::{
-    NetworkCommand, NetworkEvent, SmolPacket, TransportCommand, TransportEvent, TunnelInfo,
-};
-use crate::shutdown;
-use super::task::NetworkTask;
 
 struct MockNetwork {
     wg_to_smol_tx: Sender<NetworkEvent>,

src/network/udp.rs

@@ -265,9 +265,9 @@ mod tests {
     use super::*;
     use crate::packet_sources::udp::UdpConf;
     use crate::packet_sources::{PacketSourceConf, PacketSourceTask};
+    use crate::shutdown;
     use std::net::{IpAddr, Ipv4Addr};
     use tokio::net::UdpSocket;
-    use crate::shutdown;
 
     #[test]
     fn test_connection_state_recv_recv_read_read() {

src/packet_sources/linux.rs

@@ -15,11 +15,11 @@ use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 use crate::intercept_conf::InterceptConf;
 use crate::messages::{TransportCommand, TransportEvent};
 use crate::packet_sources::{forward_packets, PacketSourceConf, PacketSourceTask};
+use crate::shutdown;
 use tempfile::{tempdir, TempDir};
 use tokio::net::UnixDatagram;
 use tokio::process::Command;
 use tokio::time::timeout;
-use crate::shutdown;
 
 async fn start_redirector(
     executable: &Path,
@@ -62,7 +62,7 @@ async fn start_redirector(
             if shutdown2.is_shutting_down() {
                 // We don't want to log during exit, https://github.com/vorner/pyo3-log/issues/30
                 eprintln!("{}", line);
-                continue
+                continue;
             }
 
             let new_level = line
@@ -104,11 +104,11 @@ async fn start_redirector(
         Duration::from_secs(5),
         BufReader::new(stdout).lines().next_line(),
     )
-        .await
-        .context("failed to establish connection to Linux redirector")?
-        .context("failed to read redirector stdout")?
-        .map(PathBuf::from)
-        .context("redirector did not produce stdout")
+    .await
+    .context("failed to establish connection to Linux redirector")?
+    .context("failed to read redirector stdout")?
+    .map(PathBuf::from)
+    .context("redirector did not produce stdout")
 }
 
 pub struct LinuxConf {
@@ -169,7 +169,8 @@ impl PacketSourceConf for LinuxConf {
         let datagram_dir = tempdir().context("failed to create temp dir")?;
 
         let channel = UnixDatagram::bind(datagram_dir.path().join("mitmproxy"))?;
-        let dst = start_redirector(&self.executable_path, datagram_dir.path(), shutdown.clone()).await?;
+        let dst =
+            start_redirector(&self.executable_path, datagram_dir.path(), shutdown.clone()).await?;
 
         channel
             .connect(&dst)

src/packet_sources/macos.rs

@@ -25,7 +25,7 @@ use crate::network::udp::ConnectionState;
 use tokio::process::Command;
 use tokio::sync::mpsc::Sender;
 use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
-use tokio::sync::{watch, oneshot};
+use tokio::sync::{oneshot, watch};
 use tokio::task::JoinSet;
 use tokio::time::timeout;
 use tokio_util::codec::{Framed, LengthDelimitedCodec};

src/packet_sources/mod.rs

@@ -10,8 +10,8 @@ use prost::bytes::{Bytes, BytesMut};
 use prost::Message;
 use std::future::Future;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
-use tokio::sync::mpsc::{Sender, UnboundedReceiver};
 use tokio::sync::mpsc;
+use tokio::sync::mpsc::{Sender, UnboundedReceiver};
 
 #[cfg(target_os = "linux")]
 pub mod linux;

src/packet_sources/tun.rs

@@ -3,13 +3,13 @@ use crate::messages::{
 };
 use crate::network::{add_network_layer, MAX_PACKET_SIZE};
 use crate::packet_sources::{PacketSourceConf, PacketSourceTask};
+use crate::shutdown;
 use anyhow::{Context, Result};
 use std::cmp::max;
 use std::fs;
-use tokio::sync::mpsc::{Permit, Receiver, UnboundedReceiver};
 use tokio::sync::mpsc::Sender;
+use tokio::sync::mpsc::{Permit, Receiver, UnboundedReceiver};
 use tun::AbstractDevice;
-use crate::shutdown;
 
 pub struct TunConf {
     pub tun_name: Option<String>,

src/packet_sources/udp.rs

@@ -3,14 +3,14 @@ use std::str::FromStr;
 
 use anyhow::{Context, Result};
 
-use socket2::{Domain, Protocol, Socket, Type};
-use tokio::sync::mpsc::{Permit, UnboundedReceiver, Sender};
-use tokio::net::UdpSocket;
 use crate::messages::{TransportCommand, TransportEvent, TunnelInfo};
 use crate::network::udp::{UdpHandler, UdpPacket};
 use crate::network::MAX_PACKET_SIZE;
 use crate::packet_sources::{PacketSourceConf, PacketSourceTask};
 use crate::shutdown;
+use socket2::{Domain, Protocol, Socket, Type};
+use tokio::net::UdpSocket;
+use tokio::sync::mpsc::{Permit, Sender, UnboundedReceiver};
 
 pub fn remote_host_closed_conn<T>(_res: &Result<T, std::io::Error>) -> bool {
     #[cfg(windows)]