hatter/rust_util
1
0
Fork 0
mirror of https://github.com/jht5945/rust_util.git synced 2025-12-29 16:40:05 +08:00
Code Issues Releases Wiki Activity

refactor: fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-09-19 20:12:40 +08:00
parent 20b452656e
commit e027f8f713
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util_file.rs
View File

@@ -26,11 +26,7 @@ impl JoinFilesReader {
if !files.is_empty() { if !files.is_empty() {
file_lines = Some(Box::new(open_file_as_lines(&files[0])?)); file_lines = Some(Box::new(open_file_as_lines(&files[0])?));
} }
Ok(Self { Ok(Self { files, file_ptr, file_lines })
files,
file_ptr,
file_lines,
})
} }
} }

4
src/util_msg.rs
View File

@@ -22,7 +22,9 @@ impl MessageType {
} }
pub fn get_logger_level() -> MessageType { pub fn get_logger_level() -> MessageType {
if let Some(logger_level) = env::var("LOGGER_LEVEL").ok().or(env::var("LOGGER").ok()).or(env::var("LEVEL").ok()) { if let Some(logger_level) = env::var("LOGGER_LEVEL").ok()
.or_else(|| env::var("LOGGER").ok())
.or_else(|| env::var("LEVEL").ok()) {
match logger_level.trim().to_lowercase().as_str() { match logger_level.trim().to_lowercase().as_str() {
"debug" | "*" => MessageType::DEBUG, "debug" | "*" => MessageType::DEBUG,
"info" | "?" => MessageType::INFO, "info" | "?" => MessageType::INFO,

4
src/util_net.rs
View File

@@ -12,7 +12,7 @@ pub enum IpAddress {
impl IpAddress { impl IpAddress {
pub fn parse_ipv4(addr: &str) -> Option<Self> { pub fn parse_ipv4(addr: &str) -> Option<Self> {
parse_ipv4_addr(addr).map(|parts| IpAddress::Ipv4(parts)) parse_ipv4_addr(addr).map(IpAddress::Ipv4)
} }
pub fn to_address(&self) -> String { pub fn to_address(&self) -> String {
@@ -23,7 +23,7 @@ impl IpAddress {
pub fn is_matches(&self, socket_addr: &SocketAddr) -> bool { pub fn is_matches(&self, socket_addr: &SocketAddr) -> bool {
match self { match self {
IpAddress::Ipv4(self_ipv4_octets) => IpAddressMask::Ipv4(self_ipv4_octets.clone(), 32).is_matches(socket_addr), IpAddress::Ipv4(self_ipv4_octets) => IpAddressMask::Ipv4(*self_ipv4_octets, 32).is_matches(socket_addr),
} }
} }
} }