# HG changeset patch # User Michel Alexandre Salim # Date 1591569990 25200 # Sun Jun 07 15:46:30 2020 -0700 # Node ID b84a8dc53b716b0b91c4f821ed26ac3d9030b1ac # Parent 6c94b132e3711163bd0020b10542528fe1ee4da5 cargo clippy diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -28,10 +28,11 @@ // second priority: in the user's config dir match env::var("XDG_CONFIG_HOME") { Ok(confdir) => paths.push(PathBuf::from(&confdir).join("choosier")), - Err(_) => match env::var("HOME") { - Ok(homedir) => paths.push(PathBuf::from(&homedir).join(".config").join("choosier")), - Err(_) => (), - }, + Err(_) => { + if let Ok(homedir) = env::var("HOME") { + paths.push(PathBuf::from(&homedir).join(".config").join("choosier")) + } + } } // third priority: in /etc @@ -40,7 +41,7 @@ for p in paths { let cfg_path = p.join("choosier.toml"); if cfg_path.exists() { - return Ok(cfg_path.to_owned()); + return Ok(cfg_path); } } Err(io::Error::new( @@ -73,11 +74,8 @@ for (browser, urls) in config.overrides { for u in urls { - match url.find(&u) { - Some(_) => { - pick = browser.to_string(); - } - None => (), + if url.find(&u).is_some() { + pick = browser.to_string(); } } }