cargo formatted: most result errors are strings

Author: mendelsshop

git-function-history-lib/src/languages/umpl.rs

@@ -1,6 +1,6 @@
 use umpl::{self, parser::Thing};
 
-use std::{fmt};
+use std::fmt;
 
 use crate::impl_function_trait;
 

git-function-history-lib/src/lib.rs

@@ -20,8 +20,10 @@ macro_rules! get_item_from {
     ($oid:expr, $repo:expr, $typs:ident) => {
         git_repository::hash::ObjectId::from($oid)
             .attach(&$repo)
-            .object().map_err(|_| "Could not find object")?
-            .$typs().map_err(|_| format!("Could not find {} from object", stringify!($typs)))?
+            .object()
+            .map_err(|_| "Could not find object")?
+            .$typs()
+            .map_err(|_| format!("Could not find {} from object", stringify!($typs)))?
     };
 }
 
@@ -414,8 +416,11 @@ fn traverse_tree(
                         }
                     },
                 }
-                let obh = repo.find_object(i.oid()).map_err(|_| "failed to find object")?;
-                let objref = objs::ObjectRef::from_bytes(obh.kind, &obh.data).map_err(|_| "failed to get object ref")?;
+                let obh = repo
+                    .find_object(i.oid())
+                    .map_err(|_| "failed to find object")?;
+                let objref = objs::ObjectRef::from_bytes(obh.kind, &obh.data)
+                    .map_err(|_| "failed to get object ref")?;
                 let blob = objref.into_blob();
                 if let Some(blob) = blob {
                     files.push((file, String::from_utf8_lossy(blob.data).to_string()));
@@ -534,7 +539,7 @@ fn find_function_in_file_with_commit(
 ) -> Result<FileType, String> {
     let file = match langs {
         Language::Rust => {
-            let functions =  rust::find_function_in_file(fc, name)?;
+            let functions = rust::find_function_in_file(fc, name)?;
             FileType::Rust(RustFile::new(file_path.to_string(), functions))
         }
         // #[cfg(feature = "c_lang")]
@@ -544,25 +549,24 @@ fn find_function_in_file_with_commit(
         // }
         #[cfg(feature = "unstable")]
         Language::Go => {
-            let functions =  languages::go::find_function_in_file(fc, name)?;
+            let functions = languages::go::find_function_in_file(fc, name)?;
             FileType::Go(GoFile::new(file_path.to_string(), functions))
         }
         Language::Python => {
-            let functions =  languages::python::find_function_in_file(fc, name)?;
+            let functions = languages::python::find_function_in_file(fc, name)?;
             FileType::Python(PythonFile::new(file_path.to_string(), functions))
         }
         Language::Ruby => {
-            let functions =  languages::ruby::find_function_in_file(fc, name)?;
+            let functions = languages::ruby::find_function_in_file(fc, name)?;
             FileType::Ruby(RubyFile::new(file_path.to_string(), functions))
         }
         Language::UMPL => {
-            let functions =  languages::umpl::find_function_in_file(fc, name)?;
+            let functions = languages::umpl::find_function_in_file(fc, name)?;
             FileType::UMPL(UMPLFile::new(file_path.to_string(), functions))
         }
         Language::All => match file_path.split('.').last() {
             Some("rs") => {
-                
-                let functions =  rust::find_function_in_file(fc, name)?;
+                let functions = rust::find_function_in_file(fc, name)?;
                 FileType::Rust(RustFile::new(file_path.to_string(), functions))
             }
             // #[cfg(feature = "c_lang")]
@@ -571,16 +575,16 @@ fn find_function_in_file_with_commit(
             //     FileType::C(CFile::new(file_path.to_string(), functions))
             // }
             Some("py" | "pyw") => {
-                let functions =  languages::python::find_function_in_file(fc, name)?;
+                let functions = languages::python::find_function_in_file(fc, name)?;
                 FileType::Python(PythonFile::new(file_path.to_string(), functions))
             }
             #[cfg(feature = "unstable")]
             Some("go") => {
-                let functions =  languages::go::find_function_in_file(fc, name)?;
+                let functions = languages::go::find_function_in_file(fc, name)?;
                 FileType::Go(GoFile::new(file_path.to_string(), functions))
             }
             Some("rb") => {
-                let functions =  languages::ruby::find_function_in_file(fc, name)?;
+                let functions = languages::ruby::find_function_in_file(fc, name)?;
                 FileType::Ruby(RubyFile::new(file_path.to_string(), functions))
             }
             _ => Err("unknown file type")?,
@@ -618,7 +622,6 @@ trait UnwrapToError<T> {
 }
 
 impl<T> UnwrapToError<T> for Option<T> {
-
     fn unwrap_to_error(self, message: &str) -> Result<T, String> {
         self.map_or_else(|| Err(message.to_string()), |val| Ok(val))
     }

git-function-history-lib/src/types.rs

@@ -58,11 +58,11 @@ impl FileTrait for FileType {
     fn filter_by(&self, filter: &Filter) -> Result<Self, String> {
         match self {
             Self::Rust(file) => {
-                let filtered =  file.filter_by(filter)?;
+                let filtered = file.filter_by(filter)?;
                 Ok(Self::Rust(filtered))
             }
             Self::Python(file) => {
-                let filtered =  file.filter_by(filter)?;
+                let filtered = file.filter_by(filter)?;
                 Ok(Self::Python(filtered))
             }
 
@@ -73,15 +73,15 @@ impl FileTrait for FileType {
             // }
             #[cfg(feature = "unstable")]
             Self::Go(file) => {
-                let filtered =  file.filter_by(filter)?;
+                let filtered = file.filter_by(filter)?;
                 Ok(Self::Go(filtered))
             }
             Self::Ruby(file) => {
-                let filtered =  file.filter_by(filter)?;
+                let filtered = file.filter_by(filter)?;
                 Ok(Self::Ruby(filtered))
             }
             Self::UMPL(file) => {
-                let filtered =  file.filter_by(filter)?;
+                let filtered = file.filter_by(filter)?;
                 Ok(Self::UMPL(filtered))
             }
         }
@@ -158,7 +158,7 @@ impl Commit {
         Ok(Self {
             commit_hash: commit_hash.to_string(),
             files,
-            date:DateTime::parse_from_rfc2822(date).map_err(|e| e.to_string())?,
+            date: DateTime::parse_from_rfc2822(date).map_err(|e| e.to_string())?,
             current_pos: 0,
             current_iter_pos: 0,
             author: author.to_string(),