refactor: deduplicate storage of original canonicalized path

flox · Apr 23, 2024 · b45a34d · b45a34d
1 parent d8c510f
commit b45a34d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cli/flox-rust-sdk/src/models/environment/mod.rs b/cli/flox-rust-sdk/src/models/environment/mod.rs
@@ -437,11 +437,8 @@ pub enum EnvironmentError {
     #[error("could not get current directory")]
     GetCurrentDir(#[source] std::io::Error),
 
-    #[error("failed to get canonical path for '.flox' directory: {path}")]
-    CanonicalDotFlox {
-        err: CanonicalizeError,
-        path: PathBuf,
-    },
+    #[error("failed to get canonical path for '.flox' directory")]
+    CanonicalDotFlox(#[source] CanonicalizeError),
 
     #[error("failed to access the environment registry")]
     Registry(#[from] EnvRegistryError),

diff --git a/cli/flox-rust-sdk/src/models/environment/path_environment.rs b/cli/flox-rust-sdk/src/models/environment/path_environment.rs
@@ -364,10 +364,8 @@ impl PathEnvironment {
         }
 
         let canonical_dot_flox =
-            CanonicalPath::new(&dot_flox_path).map_err(|e| EnvironmentError::CanonicalDotFlox {
-                err: e,
-                path: dot_flox_path.as_ref().to_path_buf(),
-            })?;
+            CanonicalPath::new(&dot_flox_path).map_err(EnvironmentError::CanonicalDotFlox)?;
+
         ensure_registered(
             flox,
             &canonical_dot_flox,