refactor

- re-use method name based on similar semantics used elsewhere
- cleanup EnvironmentOverrides::from_env

Author: Byron

git-discover/src/upwards.rs

@@ -65,11 +65,12 @@ impl Default for Options {
 
 impl Options {
     /// Loads discovery options overrides from the environment.
+    ///
     /// The environment variables are:
     /// - `GIT_CEILING_DIRECTORIES` for `ceiling_dirs`
     /// - `GIT_DISCOVERY_ACROSS_FILESYSTEM` for `cross_fs`
     // TODO: test
-    pub fn load_env_overrides(&mut self) {
+    pub fn apply_environment(&mut self) {
         /// Gets the values of an environment variable as bytes.
         fn get_env_bytes(name: &str) -> Option<Vec<u8>> {
             env::var_os(name).and_then(|c| Vec::from_os_string(c).ok())

git-repository/src/lib.rs

@@ -421,8 +421,8 @@ pub mod discover {
             Self::discover_with_environment_overrides_opts(directory, Default::default(), Default::default())
         }
 
-        /// Try to open a git repository directly from the environment.
-        /// If that fails, discover upwards from `directory` until one is found,
+        /// Try to open a git repository directly from the environment, which reads `GIT_DIR`
+        /// if it is set. If unset, discover upwards from `directory` until one is found,
         /// while applying `options` with overrides from the environment.
         ///
         /// Then use the `trust_map` to determine which of our own repository options to use.
@@ -434,7 +434,7 @@ pub mod discover {
             if std::env::var_os("GIT_DIR").is_some() {
                 return Self::open_with_environment_overrides(directory.as_ref(), trust_map).map_err(Error::Open);
             }
-            options.load_env_overrides();
+            options.apply_environment();
             Self::discover_opts(directory, options, trust_map)
         }
     }

git-repository/src/open.rs

@@ -82,17 +82,14 @@ pub(crate) struct EnvironmentOverrides {
 }
 
 impl EnvironmentOverrides {
-    // TODO: tests
-    fn from_env(
-        git_prefix: crate::permission::env_var::Resource,
-    ) -> Result<Self, crate::permission::env_var::resource::Error> {
+    fn from_env() -> Result<Self, crate::permission::env_var::resource::Error> {
         let mut worktree_dir = None;
         if let Some(path) = std::env::var_os("GIT_WORK_TREE") {
-            worktree_dir = git_prefix.check(PathBuf::from(path))?;
+            worktree_dir = PathBuf::from(path).into();
         }
         let mut git_dir = None;
         if let Some(path) = std::env::var_os("GIT_DIR") {
-            git_dir = git_prefix.check(PathBuf::from(path))?;
+            git_dir = PathBuf::from(path).into();
         }
         Ok(EnvironmentOverrides { worktree_dir, git_dir })
     }
@@ -198,7 +195,7 @@ impl crate::ThreadSafeRepository {
         fallback_directory: impl Into<PathBuf>,
         trust_map: git_sec::trust::Mapping<Options>,
     ) -> Result<Self, Error> {
-        let overrides = EnvironmentOverrides::from_env(git_sec::Access::resource(git_sec::Permission::Allow))?;
+        let overrides = EnvironmentOverrides::from_env()?;
         let (path, path_kind): (PathBuf, _) = match overrides.git_dir {
             Some(git_dir) => git_discover::is_git(&git_dir).map(|kind| (git_dir, kind))?,
             None => {