fix: display error source for grammar errors if they exist (#289)

waycrate · Jan 21, 2025 · 967040a · 967040a
1 parent 75bcd8d
commit 967040a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/swhkd/src/config.rs b/swhkd/src/config.rs
@@ -4,7 +4,7 @@ use sweet::{Definition, SwhkdParser};
 use sweet::{ModeInstruction, ParseError};
 
 pub fn load(path: &Path) -> Result<Vec<Mode>, ParseError> {
-    let config_self = sweet::SwhkdParser::from(sweet::ParserInput::Path(path)).unwrap();
+    let config_self = sweet::SwhkdParser::from(sweet::ParserInput::Path(path))?;
     parse_contents(config_self)
 }
 

diff --git a/swhkd/src/daemon.rs b/swhkd/src/daemon.rs
@@ -247,6 +247,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
         match config::load(&config_file_path) {
             Err(e) => {
                 log::error!("Config Error: {}", e);
+                if let Some(error_source) = e.source() {
+                    log::error!("{}", error_source);
+                }
                 exit(1)
             }
             Ok(out) => out,