@@ 28,10 28,11 @@ impl Config {
// 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 @@ impl Config {
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 @@ fn open_url(url: &str, config: Config) {
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();
}
}
}