Merge pull request #27 from MikeWalrus/master

roosta · web-flow · commit bac24da5042c · 2022-03-15T15:24:55.000+01:00
fix: panic when the default config file doesn't exist
diff --git a/src/main.rs b/src/main.rs
@@ -87,7 +87,7 @@ fn main() -> Result<(), ExitFailure> {
                 Ok(Config {icons: i3wsr::icons::get_icons(icons), ..Default::default()})
             }
         }
-    }.context(format!("Could not parse config file:\n {:?}", config_path_used.unwrap()))?;
+    }.with_context(|_|format!("Could not parse config file:\n {:?}", config_path_used.unwrap()))?;
 
     if no_icon_names {
         config.options.insert("no_icon_names".to_string(), no_icon_names);

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ fn main() -> Result<(), ExitFailure> {`
`87`	`87`	`Ok(Config {icons: i3wsr::icons::get_icons(icons), ..Default::default()})`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`- }.context(format!("Could not parse config file:\n {:?}", config_path_used.unwrap()))?;`
	`90`	`+ }.with_context(\|_\|format!("Could not parse config file:\n {:?}", config_path_used.unwrap()))?;`
`91`	`91`
`92`	`92`	`if no_icon_names {`
`93`	`93`	`config.options.insert("no_icon_names".to_string(), no_icon_names);`