Review

Author: zanieb

crates/uv-cli/src/lib.rs

@@ -46,19 +46,14 @@ pub enum PythonListFormat {
     Json,
 }
 
-#[derive(Debug, Default, Clone, clap::ValueEnum)]
+#[derive(Debug, Default, Clone, Copy, clap::ValueEnum)]
 pub enum SyncFormat {
     /// Display the result in a human-readable format.
     #[default]
     Text,
     /// Display the result in JSON format.
     Json,
 }
-impl SyncFormat {
-    pub fn is_json(&self) -> bool {
-        matches!(self, SyncFormat::Json)
-    }
-}
 
 #[derive(Debug, Default, Clone, clap::ValueEnum)]
 pub enum ListFormat {
@@ -3179,7 +3174,7 @@ pub struct SyncArgs {
 
     /// Select the output format.
     #[arg(long, value_enum, default_value_t = SyncFormat::default())]
-    pub format: SyncFormat,
+    pub output_format: SyncFormat,
 
     /// Include all optional dependencies.
     ///

crates/uv/src/commands/project/mod.rs

@@ -1212,14 +1212,14 @@ enum ProjectEnvironment {
     /// requirements. A new environment would've been created, but `--dry-run` mode is enabled; as
     /// such, a temporary environment was created instead.
     WouldReplace(
-        #[allow(dead_code)] PathBuf,
+        PathBuf,
         PythonEnvironment,
         #[allow(unused)] tempfile::TempDir,
     ),
     /// A new [`PythonEnvironment`] would've been created, but `--dry-run` mode is enabled; as such,
     /// a temporary environment was created instead.
     WouldCreate(
-        #[allow(dead_code)] PathBuf,
+        PathBuf,
         PythonEnvironment,
         #[allow(unused)] tempfile::TempDir,
     ),
@@ -1406,6 +1406,14 @@ impl ProjectEnvironment {
             Self::WouldCreate(..) => Err(ProjectError::DroppedEnvironment),
         }
     }
+
+    /// Return the path to the actual target, if this was a dry run environment.
+    pub(crate) fn dry_run_target(&self) -> Option<&Path> {
+        match self {
+            Self::WouldReplace(path, _, _) | Self::WouldCreate(path, _, _) => Some(path),
+            Self::Created(_) | Self::Existing(_) | Self::Replaced(_) => None,
+        }
+    }
 }
 
 impl std::ops::Deref for ProjectEnvironment {
@@ -1436,14 +1444,14 @@ enum ScriptEnvironment {
     /// requirements. A new environment would've been created, but `--dry-run` mode is enabled; as
     /// such, a temporary environment was created instead.
     WouldReplace(
-        #[allow(dead_code)] PathBuf,
+        PathBuf,
         PythonEnvironment,
         #[allow(unused)] tempfile::TempDir,
     ),
     /// A new [`PythonEnvironment`] would've been created, but `--dry-run` mode is enabled; as such,
     /// a temporary environment was created instead.
     WouldCreate(
-        #[allow(dead_code)] PathBuf,
+        PathBuf,
         PythonEnvironment,
         #[allow(unused)] tempfile::TempDir,
     ),
@@ -1586,6 +1594,14 @@ impl ScriptEnvironment {
             Self::WouldCreate(..) => Err(ProjectError::DroppedEnvironment),
         }
     }
+
+    /// Return the path to the actual target, if this was a dry run environment.
+    pub(crate) fn dry_run_target(&self) -> Option<&Path> {
+        match self {
+            Self::WouldReplace(path, _, _) | Self::WouldCreate(path, _, _) => Some(path),
+            Self::Created(_) | Self::Existing(_) | Self::Replaced(_) => None,
+        }
+    }
 }
 
 impl std::ops::Deref for ScriptEnvironment {