From 27f4493ab3ce0247765d6595eaca0f1cd9d3a3a4 Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Wed, 6 Oct 2021 21:02:12 +0800
Subject: [PATCH] fix windows build issue

---
 crates/shadowsocks-service/src/config.rs        | 4 +---
 crates/shadowsocks/src/dns_resolver/resolver.rs | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs
index 08697c07..dcf3515d 100644
--- a/crates/shadowsocks-service/src/config.rs
+++ b/crates/shadowsocks-service/src/config.rs
@@ -41,8 +41,6 @@
 //!
 //! These defined server will be used with a load balancing algorithm.
 
-#[cfg(any(unix, target_os = "android", feature = "local-flow-stat"))]
-use std::path::PathBuf;
 use std::{
     convert::{From, Infallible},
     default::Default,
@@ -51,7 +49,7 @@ use std::{
     io::Read,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
     option::Option,
-    path::Path,
+    path::{Path, PathBuf},
     str::FromStr,
     string::ToString,
     time::Duration,
diff --git a/crates/shadowsocks/src/dns_resolver/resolver.rs b/crates/shadowsocks/src/dns_resolver/resolver.rs
index 390d64a8..1f242c99 100644
--- a/crates/shadowsocks/src/dns_resolver/resolver.rs
+++ b/crates/shadowsocks/src/dns_resolver/resolver.rs
@@ -6,7 +6,7 @@ use std::{
     fmt::{self, Debug},
     io::{self, Error, ErrorKind},
     net::SocketAddr,
-    time::{Duration, Instant},
+    time::Instant,
 };
 
 #[cfg(feature = "trust-dns")]
@@ -16,9 +16,9 @@ use cfg_if::cfg_if;
 #[cfg(feature = "trust-dns")]
 use log::error;
 use log::{log_enabled, trace, Level};
+use tokio::net::lookup_host;
 #[cfg(feature = "trust-dns")]
 use tokio::task::JoinHandle;
-use tokio::{net::lookup_host, time};
 #[cfg(feature = "trust-dns")]
 use trust_dns_resolver::{config::ResolverConfig, TokioAsyncResolver};
 
@@ -135,11 +135,11 @@ cfg_if! {
 
 #[cfg(all(feature = "trust-dns", unix, not(target_os = "android")))]
 async fn trust_dns_notify_update_dns(resolver: Arc<TrustDnsSystemResolver>) -> notify::Result<()> {
-    use std::path::Path;
+    use std::{path::Path, time::Duration};
 
     use log::debug;
     use notify::{Event, EventKind, RecommendedWatcher, RecursiveMode, Result as NotifyResult, Watcher};
-    use tokio::sync::watch;
+    use tokio::{sync::watch, time};
 
     use super::trust_dns_resolver::create_resolver;