refactor (#450)

Author: Byron

Makefile

@@ -73,8 +73,7 @@ check: ## Build all code in suitable configurations
                   && cargo check --features verbose-object-parsing-errors
 	cd git-index && cargo check --features serde1
 	cd git-credentials && cargo check --features serde1
-	cd git-sec && cargo check --features serde1 \
-						cargo check --features thiserror
+	cd git-sec && cargo check --features serde1
 	cd git-revision && cargo check --features serde1
 	cd git-attributes && cargo check --features serde1
 	cd git-glob && cargo check --features serde1

git-repository/src/config/cache/init.rs

@@ -80,7 +80,7 @@ impl Cache {
                                     "HOME" => Some(home_env),
                                     _ => None,
                                 }
-                                .and_then(|perm| std::env::var_os(name).and_then(|val| perm.check(val).ok().flatten()))
+                                .and_then(|perm| std::env::var_os(name).and_then(|val| perm.check_opt(val)))
                             })
                             .map(|p| (source, p.into_owned()))
                     }
@@ -189,6 +189,6 @@ impl Cache {
     pub fn home_dir(&self) -> Option<PathBuf> {
         std::env::var_os("HOME")
             .map(PathBuf::from)
-            .and_then(|path| self.home_env.check(path).ok().flatten())
+            .and_then(|path| self.home_env.check_opt(path))
     }
 }

git-repository/src/open.rs

@@ -356,7 +356,7 @@ impl ThreadSafeRepository {
         let git_install_dir = crate::path::install_dir().ok();
         let home = std::env::var_os("HOME")
             .map(PathBuf::from)
-            .and_then(|home| env.home.check(home).ok().flatten());
+            .and_then(|home| env.home.check_opt(home));
 
         let mut filter_config_section = filter_config_section.unwrap_or(config::section::is_trusted);
         let config = config::Cache::from_stage_one(

git-repository/src/remote/url/scheme_permission.rs

@@ -103,7 +103,7 @@ impl SchemePermission {
 
         let user_allowed = saw_user.then(|| {
             std::env::var_os("GIT_PROTOCOL_FROM_USER")
-                .and_then(|val| git_prefix.check(val).ok().flatten())
+                .and_then(|val| git_prefix.check_opt(val))
                 .map_or(true, |val| val == "1")
         });
         Ok(SchemePermission {