diff --git a/src/ip.rs b/src/ip.rs index 93a48aa..b1f55a6 100644 --- a/src/ip.rs +++ b/src/ip.rs @@ -89,7 +89,7 @@ impl Display for IpData { } pub fn filter( - lines: Box, + reader: Box, iplist: &mut Vec, trustnets: &Vec, regex: &Regex, @@ -98,7 +98,8 @@ pub fn filter( ) -> isize { let mut ips = 0; let hostname = gethostname(true); - for line in BufReader::new(lines).lines() { + let lines = BufReader::new(reader).lines(); + for line in lines.into_iter() { if let Ok(l) = line { if regex.is_match(l.as_str()) { let s_ipaddr: String; diff --git a/src/ipblc.rs b/src/ipblc.rs index d2cf688..7e40f85 100644 --- a/src/ipblc.rs +++ b/src/ipblc.rs @@ -181,12 +181,12 @@ async fn watchfiles(inoarc: Arc>) -> Receiver { async fn get_last_file_size(w: &mut HashMap, path: &str) -> (u64, bool) { let currentlen = match std::fs::metadata(&path.to_string()) { - Ok(u) => u.len().clone(), + Ok(u) => u.len(), Err(_) => 0u64, }; let lastlen = match w.insert(path.to_string(), currentlen) { Some(u) => u, - None => 0u64, + None => currentlen, }; (lastlen, lastlen != currentlen) }