Use anyhow::Context (#303)

src/builtin/pre_commit_hooks/check_added_large_files.rs

@@ -1,5 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
+use anyhow::Context;
 use clap::Parser;
 use futures::StreamExt;
 
@@ -34,7 +35,7 @@ pub(crate) async fn check_added_large_files(
     filenames: &[&String],
     _env_vars: &HashMap<&'static str, String>,
 ) -> anyhow::Result<(i32, Vec<u8>)> {
-    let entry = shlex::split(&hook.entry).ok_or(anyhow::anyhow!("Failed to parse entry"))?;
+    let entry = shlex::split(&hook.entry).context("Failed to parse entry")?;
     let args = Args::try_parse_from(entry.iter().chain(&hook.args))?;
 
     let filter = if args.enforce_all {

src/builtin/pre_commit_hooks/fix_trailing_whitespace.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use bstr::ByteSlice;
 use clap::Parser;
 use futures::StreamExt;
@@ -22,7 +22,7 @@ pub(crate) async fn fix_trailing_whitespace(
     filenames: &[&String],
     _env_vars: &HashMap<&'static str, String>,
 ) -> Result<(i32, Vec<u8>)> {
-    let entry = shlex::split(&hook.entry).ok_or(anyhow::anyhow!("Failed to parse entry"))?;
+    let entry = shlex::split(&hook.entry).context("Failed to parse entry")?;
     let args = Args::try_parse_from(entry.iter().chain(&hook.args))?;
 
     let force_markdown = args.markdown_linebreak_ext.iter().any(|ext| ext == "*");

src/languages/docker.rs

@@ -204,7 +204,7 @@ impl LanguageImpl for Docker {
 
         let docker_tag = Docker::docker_tag(hook);
 
-        let cmds = shlex::split(&hook.entry).ok_or(anyhow::anyhow!("Failed to parse entry"))?;
+        let cmds = shlex::split(&hook.entry).context("Failed to parse entry")?;
 
         let run = async move |batch: Vec<String>| {
             // docker run [OPTIONS] IMAGE [COMMAND] [ARG...]

src/languages/node/node.rs

@@ -96,10 +96,9 @@ impl LanguageImpl for Node {
         env_vars: &HashMap<&'static str, String>,
         _store: &Store,
     ) -> Result<(i32, Vec<u8>), Error> {
-        let env_dir = hook.env_path().expect("Python must have env path");
+        let env_dir = hook.env_path().expect("Node must have env path");
         // TODO: move split to hook construction
-        let cmds = shlex::split(&hook.entry)
-            .ok_or_else(|| anyhow::anyhow!("Failed to parse entry command"))?;
+        let cmds = shlex::split(&hook.entry).context("Failed to parse entry command")?;
 
         let new_path = prepend_path(&bin_dir(env_dir)).context("Failed to join PATH")?;
 

src/languages/python/python.rs

@@ -130,8 +130,7 @@ impl LanguageImpl for Python {
         _store: &Store,
     ) -> Result<(i32, Vec<u8>), Error> {
         let env_dir = hook.env_path().expect("Python must have env path");
-        let cmds = shlex::split(&hook.entry)
-            .ok_or_else(|| anyhow::anyhow!("Failed to parse entry command"))?;
+        let cmds = shlex::split(&hook.entry).context("Failed to parse entry")?;
 
         // Construct PATH with venv bin directory first
         let new_path = prepend_path(&bin_dir(env_dir)).context("Failed to join PATH")?;

src/languages/script.rs

@@ -1,5 +1,7 @@
 use std::collections::HashMap;
 
+use anyhow::Context;
+
 use crate::hook::Hook;
 use crate::hook::InstalledHook;
 use crate::languages::{Error, LanguageImpl};
@@ -26,7 +28,7 @@ impl LanguageImpl for Script {
         env_vars: &HashMap<&'static str, String>,
         _store: &Store,
     ) -> Result<(i32, Vec<u8>), Error> {
-        let cmds = shlex::split(&hook.entry).ok_or(anyhow::anyhow!("Failed to parse entry"))?;
+        let cmds = shlex::split(&hook.entry).context("Failed to parse entry")?;
 
         let run = async move |batch: Vec<String>| {
             let mut command = Cmd::new(&cmds[0], "run script command")

src/languages/system.rs

@@ -1,5 +1,7 @@
 use std::collections::HashMap;
 
+use anyhow::Context;
+
 use crate::hook::{Hook, InstalledHook};
 use crate::languages::{Error, LanguageImpl};
 use crate::process::Cmd;
@@ -25,7 +27,7 @@ impl LanguageImpl for System {
         env_vars: &HashMap<&'static str, String>,
         _store: &Store,
     ) -> Result<(i32, Vec<u8>), Error> {
-        let cmds = shlex::split(&hook.entry).ok_or(anyhow::anyhow!("Failed to parse entry"))?;
+        let cmds = shlex::split(&hook.entry).context("Failed to parse entry")?;
 
         let run = async move |batch: Vec<String>| {
             let mut output = Cmd::new(&cmds[0], "run system command")