fmt

Author: soapy1

crates/pixi_api/src/workspace/registry/mod.rs

@@ -1,20 +1,19 @@
 use std::collections::HashMap;
 
-use serde::{Deserialize, Serialize};
 use miette::{Context, IntoDiagnostic};
+use serde::{Deserialize, Serialize};
 
 use std::path::PathBuf;
 
-use pixi_consts::consts;
 use pixi_config::pixi_home;
-
+use pixi_consts::consts;
 
 /// Returns the path to the workspace registry file
 pub fn workspace_registry_path() -> Option<PathBuf> {
     pixi_home().map(|d| d.join(consts::WORKSPACES_REGISTRY))
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case")]
 pub struct WorkspaceRegistry {
     /// Mapping of a named workspaces to the path of their manifest file.
@@ -23,14 +22,6 @@ pub struct WorkspaceRegistry {
     pub named_workspaces: HashMap<String, PathBuf>,
 }
 
-impl Default for WorkspaceRegistry {
-    fn default() -> Self {
-        Self {
-            named_workspaces: HashMap::new(),
-        }
-    }
-}
-
 impl WorkspaceRegistry {
     /// Loads the workspace registry from disk, if it exists.
     pub fn load() -> miette::Result<Self> {
@@ -39,22 +30,23 @@ impl WorkspaceRegistry {
 
         let contents = match fs_err::read_to_string(&path) {
             Ok(c) => c,
-            Err(e) if e.kind() == std::io::ErrorKind::NotFound || e.kind() == std::io::ErrorKind::NotADirectory => {
+            Err(e)
+                if e.kind() == std::io::ErrorKind::NotFound
+                    || e.kind() == std::io::ErrorKind::NotADirectory =>
+            {
                 // File doesn't exist yet, return default
                 return Ok(WorkspaceRegistry::default());
             }
             Err(e) => {
-                return Err(e)
-                    .into_diagnostic()?;
+                return Err(e).into_diagnostic()?;
             }
         };
 
-        let de = toml_edit::de::Deserializer::parse(&contents)
-            .into_diagnostic()?;
+        let de = toml_edit::de::Deserializer::parse(&contents).into_diagnostic()?;
 
         // Deserialize the contents
-        let registry: WorkspaceRegistry = serde_ignored::deserialize(de, |_| {})
-            .into_diagnostic()?;
+        let registry: WorkspaceRegistry =
+            serde_ignored::deserialize(de, |_| {}).into_diagnostic()?;
 
         Ok(registry)
     }
@@ -64,7 +56,6 @@ impl WorkspaceRegistry {
         let path = workspace_registry_path()
             .ok_or_else(|| miette::miette!("Unable to determine pixi home directory"))?;
 
-
         if let Some(parent) = path.parent() {
             fs_err::create_dir_all(parent)
                 .into_diagnostic()
@@ -86,25 +77,15 @@ impl WorkspaceRegistry {
             self.named_workspaces.remove(name);
             self.save().await?;
         } else {
-            return Err(
-                miette::diagnostic!("Workspace '{}' is not found.", name,).into(),
-            );
+            return Err(miette::diagnostic!("Workspace '{}' is not found.", name,).into());
         }
         Ok(())
     }
 
     /// Add a workspace to the registry given the name and path association
     pub async fn add_workspace(&mut self, name: String, path: PathBuf) -> miette::Result<()> {
-        if self.named_workspaces.contains_key(&name) {
-            return Err(miette::diagnostic!(
-                "Workspace with name '{}' is already registered.",
-                name,
-            )
-            .into());
-        } else {
-            self.named_workspaces.insert(name, path);
-            self.save().await?;
-        }
+        self.named_workspaces.entry(name).or_insert(path);
+        self.save().await?;
         Ok(())
     }
 

crates/pixi_cli/src/cli_config.rs

@@ -48,8 +48,11 @@ impl WorkspaceConfig {
         if let Some(manifest_path) = &self.manifest_path {
             DiscoveryStart::ExplicitManifest(manifest_path.clone())
         } else if let Some(workspace) = &self.workspace {
-            let workspace_registry = WorkspaceRegistry::load().expect("Unable to load workspace registry");
-            let path = workspace_registry.named_workspace(&workspace).expect("Unable to find workspace");
+            let workspace_registry =
+                WorkspaceRegistry::load().expect("Unable to load workspace registry");
+            let path = workspace_registry
+                .named_workspace(workspace)
+                .expect("Unable to find workspace");
             DiscoveryStart::ExplicitManifest(path)
         } else {
             DiscoveryStart::CurrentDir

crates/pixi_cli/src/workspace/register.rs

@@ -56,7 +56,6 @@ pub enum Command {
     // Prune(PruneArgs),
 }
 
-
 pub async fn execute(args: Args) -> miette::Result<()> {
     match args.command {
         Some(Command::List(args)) => {
@@ -78,7 +77,9 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         }
         Some(Command::Remove(remove_args)) => {
             let mut workspace_registry = WorkspaceRegistry::load()?;
-            workspace_registry.remove_workspace(&remove_args.name).await?;
+            workspace_registry
+                .remove_workspace(&remove_args.name)
+                .await?;
 
             eprintln!(
                 "{} Workspace '{}' has been removed from the registry successfully.",
@@ -116,7 +117,9 @@ pub async fn execute(args: Args) -> miette::Result<()> {
             let target_path = args.path.unwrap_or_else(|| workspace.root().to_path_buf());
 
             let mut workspace_registry = WorkspaceRegistry::load()?;
-            workspace_registry.add_workspace(target_name, target_path).await?;
+            workspace_registry
+                .add_workspace(target_name, target_path)
+                .await?;
 
             eprintln!(
                 "{} {}",

crates/pixi_consts/src/consts.rs

@@ -49,7 +49,6 @@ pub const CACHED_SOURCE_BUILDS: &str = "pkgs";
 pub const DEFAULT_GLOBAL_WORKSPACE_DIR: &str = "workspaces";
 pub const WORKSPACES_REGISTRY: &str = "workspaces.toml";
 
-
 /// The directory relative to the .pixi folder that stores build related caches.
 pub const WORKSPACE_CACHE_DIR: &str = "build";