diff --git a/src/main.rs b/src/main.rs index c0dae53f95..31330f6d04 100644 --- a/src/main.rs +++ b/src/main.rs @@ -80,7 +80,7 @@ fn restart() -> ! { // Add "--no-init" argument if not already added let no_init_arg = CString::new("--no-init").unwrap(); - if !arg.iter().any(|a| *a == no_init_arg) { + if !arg.contains(&no_init_arg) { arg.push(no_init_arg); } diff --git a/src/subprocess.rs b/src/subprocess.rs index 91bae866fe..f4f51ac103 100644 --- a/src/subprocess.rs +++ b/src/subprocess.rs @@ -11,10 +11,7 @@ pub fn spawn_process(cmd: &str, args: &[&str]) -> io::Result<()> { // Safety: libc::daemon() is async-signal-safe unsafe { proc.pre_exec(|| match libc::daemon(0, 0) { - -1 => Err(io::Error::new( - io::ErrorKind::Other, - "Failed to detach new process", - )), + -1 => Err(io::Error::other("Failed to detach new process")), _ => Ok(()), }); } diff --git a/src/themes/xresources.rs b/src/themes/xresources.rs index df7b718360..a821b0db8a 100644 --- a/src/themes/xresources.rs +++ b/src/themes/xresources.rs @@ -11,9 +11,7 @@ use std::{env, path::PathBuf}; #[cfg(not(test))] fn read_xresources() -> std::io::Result { - use std::io::{Error, ErrorKind}; - let home = - env::var("HOME").map_err(|_| Error::new(ErrorKind::Other, "HOME env var was not set"))?; + let home = env::var("HOME").map_err(|_| std::io::Error::other("HOME env var was not set"))?; let xresources = PathBuf::from(home + "/.Xresources"); debug!(".Xresources @ {:?}", xresources); std::fs::read_to_string(xresources)