feat: better toml error messages

Author: massivebird

Cargo.lock

@@ -17,3 +17,4 @@ serde = { version = "1.0.228", features = ["derive"] }
 ping = "0.7.1-beta.1"
 chrono = "0.4.43"
 json = "0.12.4"
+eyre = "0.6.12"

Cargo.toml

@@ -1,4 +1,5 @@
 use super::connection::{Connection, json::JsonConn};
+use eyre::Context;
 use serde::Deserialize;
 use std::{io::Read, path::PathBuf};
 
@@ -8,38 +9,26 @@ struct ConfigFile {
     json: Vec<JsonConn>,
 }
 
-pub fn read_config() -> Vec<Connection> {
-    let home = std::env::var("HOME").unwrap();
+pub fn read_config() -> eyre::Result<Vec<Connection>> {
+    let home = std::env::var("HOM").wrap_err("Failed to read HOME environment variable")?;
 
     // Full path to the toml config file.
     let toml_path = PathBuf::from(home)
         .join(".config")
         .join("lantern")
         .join("config.toml");
 
-    let Ok(mut f) = std::fs::File::open(&toml_path) else {
-        eprintln!(
-            "ERROR: failed to read configuration file: {}",
-            toml_path.display()
-        );
-        std::process::exit(1);
-    };
+    let mut f = std::fs::File::open(&toml_path)?;
 
     let mut buf = String::new();
 
-    if f.read_to_string(&mut buf).is_err() {
-        eprintln!(
-            "ERROR: failed to read configuration file: {}",
-            toml_path.display()
-        );
-        std::process::exit(1);
-    }
+    f.read_to_string(&mut buf)?;
 
-    let c: ConfigFile = toml::from_str(&buf).unwrap();
+    let c: ConfigFile = toml::from_str(&buf)?;
 
-    [
+    Ok([
         c.connection,
         c.json.into_iter().map(std::convert::Into::into).collect(),
     ]
-    .concat()
+    .concat())
 }

src/app/config.rs

@@ -34,10 +34,10 @@ pub struct App {
 }
 
 impl App {
-    pub fn generate() -> Self {
+    pub fn generate() -> eyre::Result<Self> {
         let matches: clap::ArgMatches = generate_matches();
 
-        let conns = config::read_config();
+        let conns = config::read_config()?;
 
         let output_fmt = match matches.get_one::<OutputFmt>("output_fmt") {
             Some(&fmt) => fmt,
@@ -46,12 +46,12 @@ impl App {
 
         let interval = matches.get_one::<u32>("interval").unwrap_or(&15);
 
-        Self {
+        Ok(Self {
             connections: Arc::new(Mutex::new(conns)),
             output_fmt,
             interval: *interval,
             ..Default::default()
-        }
+        })
     }
 
     pub fn next_tab(&mut self) {

src/app/mod.rs

@@ -25,8 +25,8 @@ use std::{
 mod app;
 mod ui;
 
-fn main() -> io::Result<()> {
-    let mut app = App::generate();
+fn main() -> eyre::Result<()> {
+    let mut app = App::generate()?;
 
     // Set up terminal.
     enable_raw_mode()?;