updating error-stack (#22)

Author: perryqh

Cargo.lock

@@ -9,10 +9,10 @@ debug = true
 [dependencies]
 clap = { version = "4.2.1", features = ["derive"] }
 clap_derive = "4.2.0"
-error-stack = "0.3.1"
+error-stack = "0.4.1"
 glob-match = "0.2.1"
 ignore = "0.4.20"
-itertools = "0.10.5"
+itertools = "0.12.1"
 path-clean = "1.0.1"
 rayon = "1.7.0"
 regex = "1.7.3"

Cargo.toml

@@ -1,4 +1,3 @@
-use error_stack_ext::IntoContext;
 use ownership::Ownership;
 
 use crate::project::Project;
@@ -13,7 +12,6 @@ use std::{
 };
 
 mod config;
-mod error_stack_ext;
 mod ownership;
 mod project;
 
@@ -50,7 +48,7 @@ struct Args {
 
 impl Args {
     fn absolute_project_root(&self) -> Result<PathBuf, Error> {
-        self.project_root.canonicalize().into_context(Error::Io)
+        self.project_root.canonicalize().change_context(Error::Io)
     }
 
     fn absolute_config_path(&self) -> Result<PathBuf, Error> {
@@ -98,21 +96,21 @@ fn cli() -> Result<(), Error> {
     let project_root = args.absolute_project_root()?;
 
     let config_file = File::open(&config_path)
-        .into_context(Error::Io)
+        .change_context(Error::Io)
         .attach_printable(format!("Can't open config file: {}", config_path.to_string_lossy()))?;
 
-    let config = serde_yaml::from_reader(config_file).into_context(Error::Io)?;
+    let config = serde_yaml::from_reader(config_file).change_context(Error::Io)?;
 
     let ownership = Ownership::build(Project::build(&project_root, &codeowners_file_path, &config).change_context(Error::Io)?);
 
     match args.command {
-        Command::Validate => ownership.validate().into_context(Error::ValidationFailed)?,
+        Command::Validate => ownership.validate().change_context(Error::ValidationFailed)?,
         Command::Generate => {
-            std::fs::write(codeowners_file_path, ownership.generate_file()).into_context(Error::Io)?;
+            std::fs::write(codeowners_file_path, ownership.generate_file()).change_context(Error::Io)?;
         }
         Command::GenerateAndValidate => {
-            std::fs::write(codeowners_file_path, ownership.generate_file()).into_context(Error::Io)?;
-            ownership.validate().into_context(Error::ValidationFailed)?
+            std::fs::write(codeowners_file_path, ownership.generate_file()).change_context(Error::Io)?;
+            ownership.validate().change_context(Error::ValidationFailed)?
         }
     }
 

src/error_stack_ext.rs

@@ -6,14 +6,14 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use error_stack::{Context, Result};
+use error_stack::{Context, Result, ResultExt};
 
 use ignore::WalkBuilder;
 use rayon::prelude::{IntoParallelIterator, ParallelIterator};
 use regex::Regex;
 use tracing::{info, instrument};
 
-use crate::{config::Config, error_stack_ext::IntoContext};
+use crate::config::Config;
 use glob_match::glob_match;
 
 pub struct Project {
@@ -163,10 +163,10 @@ impl Project {
         let walkdir = builder.build();
 
         for entry in walkdir {
-            let entry = entry.into_context(Error::Io)?;
+            let entry = entry.change_context(Error::Io)?;
 
             let absolute_path = entry.path();
-            let relative_path = absolute_path.strip_prefix(base_path).into_context(Error::Io)?.to_owned();
+            let relative_path = absolute_path.strip_prefix(base_path).change_context(Error::Io)?.to_owned();
 
             if entry.file_type().unwrap().is_dir() {
                 if relative_path.parent() == Some(Path::new(&config.vendored_gems_path)) {
@@ -205,7 +205,7 @@ impl Project {
             }
 
             if file_name.eq_ignore_ascii_case(".codeowner") {
-                let owner = std::fs::read_to_string(absolute_path).into_context(Error::Io)?;
+                let owner = std::fs::read_to_string(absolute_path).change_context(Error::Io)?;
                 let owner = owner.trim().to_owned();
 
                 let relative_path = relative_path.to_owned();
@@ -216,8 +216,8 @@ impl Project {
             }
 
             if matches_globs(&relative_path, &config.team_file_glob) {
-                let file = File::open(absolute_path).into_context(Error::Io)?;
-                let deserializer: deserializers::Team = serde_yaml::from_reader(file).into_context(Error::SerdeYaml)?;
+                let file = File::open(absolute_path).change_context(Error::Io)?;
+                let deserializer: deserializers::Team = serde_yaml::from_reader(file).change_context(Error::SerdeYaml)?;
 
                 teams.push(Team {
                     path: absolute_path.to_owned(),
@@ -243,7 +243,7 @@ impl Project {
         );
 
         let codeowners_file: String = if codeowners_file_path.exists() {
-            std::fs::read_to_string(codeowners_file_path).into_context(Error::Io)?
+            std::fs::read_to_string(codeowners_file_path).change_context(Error::Io)?
         } else {
             "".to_owned()
         };
@@ -326,15 +326,15 @@ fn owned_files(owned_file_paths: Vec<PathBuf>) -> Vec<ProjectFile> {
 }
 
 fn ruby_package_owner(path: &Path) -> Result<Option<String>, Error> {
-    let file = File::open(path).into_context(Error::Io)?;
-    let deserializer: deserializers::RubyPackage = serde_yaml::from_reader(file).into_context(Error::SerdeYaml)?;
+    let file = File::open(path).change_context(Error::Io)?;
+    let deserializer: deserializers::RubyPackage = serde_yaml::from_reader(file).change_context(Error::SerdeYaml)?;
 
     Ok(deserializer.owner)
 }
 
 fn javascript_package_owner(path: &Path) -> Result<Option<String>, Error> {
-    let file = File::open(path).into_context(Error::Io)?;
-    let deserializer: deserializers::JavascriptPackage = serde_json::from_reader(file).into_context(Error::SerdeJson)?;
+    let file = File::open(path).change_context(Error::Io)?;
+    let deserializer: deserializers::JavascriptPackage = serde_json::from_reader(file).change_context(Error::SerdeJson)?;
 
     Ok(deserializer.metadata.and_then(|metadata| metadata.owner))
 }