move to color_eyre

Author: evanbattaglia

Cargo.lock

@@ -6,8 +6,8 @@ description = "Utility (and mini-language) for shell completions (\"tab completi
 license = "MIT"
 
 [dependencies]
-anyhow = "1.0.72"
 clap = { version = "4.5.17", features = ["derive"] }
+color-eyre = "0.6.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 shell-words = "1.1.0"

Cargo.toml

@@ -4,7 +4,7 @@ mod config_finder;
 mod shell_tokenizer;
 
 /// Main app functionality
-use anyhow::Context;
+use color_eyre::eyre::{Context, Result, eyre};
 use std::io::Read;
 
 use crate::{
@@ -13,7 +13,7 @@ use crate::{
     lang,
 };
 
-fn print_options(config_filename: &str, tokens: &[String], last_token: &str) -> anyhow::Result<()> {
+fn print_options(config_filename: &str, tokens: &[String], last_token: &str) -> Result<()> {
     let config =
         config::TabryConf::from_file(config_filename).with_context(|| "invalid config file")?;
     let result =
@@ -44,10 +44,11 @@ fn print_options(config_filename: &str, tokens: &[String], last_token: &str) ->
 }
 
 // This runs using the filename plus 2nd arg as compline (shellsplits ARGV[2])
-pub fn run_as_compline(compline: &str, comppoint: &str) -> anyhow::Result<()> {
-    let comppoint = comppoint.parse::<usize>()?;
+pub fn run_as_compline(compline: &str, comppoint: &str) -> Result<()> {
+    let comppoint = comppoint.parse::<usize>().wrap_err_with(|| eyre!("Invalid compoint: {}", comppoint))?;
+
+    let tokenized_result = shell_tokenizer::split_with_comppoint(compline, comppoint).wrap_err_with(|| eyre!("Failed to split compline {} on comppoint {}", compline, comppoint))?;
 
-    let tokenized_result = shell_tokenizer::split_with_comppoint(compline, comppoint)?;
     let args = tokenized_result.arguments;
     let last_arg = tokenized_result.last_argument;
 

src/app/mod.rs

@@ -1,4 +1,5 @@
 use clap::{Parser, Subcommand};
+use color_eyre::eyre::Result;
 
 #[derive(Parser)]
 #[command(name = "tabry")]
@@ -69,16 +70,20 @@ enum Subcommands {
     },
 }
 
-fn main() {
+fn main() -> Result<()> {
+    color_eyre::install()?;
+
     use Subcommands::*;
     use tabry::app::*;
     let cli = Cli::parse();
     match cli.command {
-        Complete { compline, comppoint } => run_as_compline(&compline, &comppoint).unwrap(),
+        Complete { compline, comppoint } => run_as_compline(&compline, &comppoint)?,
         Compile => compile(),
         Commands => commands(),
         Bash { import_path, no_auto } => bash(import_path.as_deref(), no_auto),
         Zsh { import_path, no_auto } => zsh(import_path.as_deref(), no_auto),
         Fish { import_path, no_auto } => fish(import_path.as_deref(), no_auto),
     }
+
+    Ok(())
 }