From 64db1a54434bf8483bc30d0ee323c7dffbf3bc6d Mon Sep 17 00:00:00 2001 From: Markus Pettersson Date: Sat, 30 Nov 2024 18:23:25 +0100 Subject: [PATCH] Clean up import --- mullvad-encrypted-dns-proxy/src/forwarder.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mullvad-encrypted-dns-proxy/src/forwarder.rs b/mullvad-encrypted-dns-proxy/src/forwarder.rs index 43ebca522932..d69d38426a13 100644 --- a/mullvad-encrypted-dns-proxy/src/forwarder.rs +++ b/mullvad-encrypted-dns-proxy/src/forwarder.rs @@ -7,12 +7,11 @@ use tokio::{ net::TcpStream, }; -use crate::config::Obfuscator; +use crate::config::{Obfuscator, ProxyConfig}; /// Forwards local traffic to a proxy endpoint, obfuscating it if the proxy config says so. /// -/// Obtain [`ProxyConfig`](crate::config::ProxyConfig)s with -/// [resolve_configs](crate::config_resolver::resolve_configs). +/// Obtain [`ProxyConfig`](ProxyConfig)s with [resolve_configs](crate::config_resolver::resolve_configs). pub struct Forwarder { read_obfuscator: Option>, write_obfuscator: Option>, @@ -24,7 +23,7 @@ where S: AsyncRead + AsyncWrite + Unpin, { /// Create a [`Forwarder`] with a connected `stream` to an encrypted DNS proxy server - pub fn from_stream(proxy_config: &crate::config::ProxyConfig, stream: S) -> Self { + pub fn from_stream(proxy_config: &ProxyConfig, stream: S) -> Self { let (read_obfuscator, write_obfuscator) = if let Some(obfuscation_config) = &proxy_config.obfuscation { ( @@ -46,7 +45,7 @@ where /// Forward TCP traffic over various proxy configurations. impl Forwarder { /// Create a forwarder that will connect to a given proxy endpoint. - pub async fn connect(proxy_config: &crate::config::ProxyConfig) -> io::Result { + pub async fn connect(proxy_config: &ProxyConfig) -> io::Result { let server_connection = TcpStream::connect(proxy_config.addr).await?; Ok(Self::from_stream(proxy_config, server_connection)) }