diff --git a/src/msg/config.rs b/src/msg/config.rs
index f23bc31..85d62a8 100644
--- a/src/msg/config.rs
+++ b/src/msg/config.rs
@@ -13,7 +13,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-use crate::Result;
use serde::Deserialize;
use std::path::PathBuf;
@@ -28,12 +27,17 @@ pub struct XcrabMsgConfig {
pub socket_path: PathBuf,
}
-pub fn load_file() -> Result {
- let home_dir = std::env::var("HOME")?;
+pub fn load_file() -> XcrabConfig {
+ let home_dir = std::env::var("HOME").expect("Error: $HOME variable was not set");
- let contents = std::fs::read_to_string(format!("{}/.config/xcrab/config.toml", home_dir))?;
+ let contents = std::fs::read_to_string(format!("{}/.config/xcrab/config.toml", home_dir))
+ .expect(&format!(
+ "Error: file {}/.config/xcrab/config.toml was not found",
+ home_dir
+ ));
- let config: XcrabConfig = toml::from_str(&contents)?;
+ let config: XcrabConfig = toml::from_str(&contents)
+ .expect("Error: config file was not parseable. Is it properly formatted?");
- Ok(config)
+ config
}
diff --git a/src/msg/main.rs b/src/msg/main.rs
index d9a4aca..863224e 100644
--- a/src/msg/main.rs
+++ b/src/msg/main.rs
@@ -24,7 +24,7 @@ type Result = std::result::Result>;
async fn main() -> Result<()> {
let msg = std::env::args().skip(1).collect::>().join(" ");
- let conf = config::load_file()?;
+ let conf = config::load_file();
let path = conf.msg.expect("xcrab-msg not configured!").socket_path;