diff --git a/easytier/src/common/log.rs b/easytier/src/common/log.rs index a24af70a..2d0dc067 100644 --- a/easytier/src/common/log.rs +++ b/easytier/src/common/log.rs @@ -117,9 +117,9 @@ pub fn init( Ok(sender) } -fn console_layers( - default_level: LevelFilter, -) -> anyhow::Result + Send + Sync>>> { +type BoxLayer = Box + Send + Sync>; + +fn console_layers(default_level: LevelFilter) -> anyhow::Result> { let mut layers = Vec::new(); if default_level == LevelFilter::OFF { return Ok(layers); @@ -171,10 +171,7 @@ fn console_layers( fn file_layers( config: FileLoggerConfig, reload: bool, -) -> anyhow::Result<( - Vec + Send + Sync>>, - Option, -)> { +) -> anyhow::Result<(Vec, Option)> { let mut layers = Vec::new(); let level = config diff --git a/easytier/src/dns/node.rs b/easytier/src/dns/node.rs index 48fdee68..e3f2e230 100644 --- a/easytier/src/dns/node.rs +++ b/easytier/src/dns/node.rs @@ -4,7 +4,7 @@ use crate::dns::peer_mgr::DnsPeerMgr; use crate::dns::server::DnsServer; use crate::peers::peer_manager::PeerManager; use crate::peers::NicPacketFilter; -use crate::proto::dns::{DnsNodeMgrRpcClientFactory, DnsPeerMgrRpcServer, HeartbeatRequest}; +use crate::proto::dns::{DnsNodeMgrRpcClientFactory, HeartbeatRequest}; use crate::proto::rpc_impl::standalone::{StandAloneClient, StandAloneServer}; use crate::proto::rpc_types::controller::BaseController; use crate::tunnel::tcp::{TcpTunnelConnector, TcpTunnelListener}; diff --git a/easytier/src/dns/system/mod.rs b/easytier/src/dns/system/mod.rs index 83d15363..0fe892b4 100644 --- a/easytier/src/dns/system/mod.rs +++ b/easytier/src/dns/system/mod.rs @@ -1,3 +1,4 @@ +#[allow(unused_imports)] use crate::utils::BoxExt; #[cfg(target_os = "linux")]