refactor(ws): Inline target_dir() into build_dir()

epage · epage · commit fe131fc575e8 · 2025-10-10T15:23:52.000-05:00
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -439,7 +439,10 @@ impl<'gctx> Workspace<'gctx> {
     }
 
     pub fn build_dir(&self) -> Filesystem {
-        self.build_dir.clone().unwrap_or_else(|| self.target_dir())
+        self.build_dir
+            .clone()
+            .or_else(|| self.target_dir.clone())
+            .unwrap_or_else(|| self.default_target_dir())
     }
 
     fn default_target_dir(&self) -> Filesystem {

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,10 @@ impl<'gctx> Workspace<'gctx> {`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`pub fn build_dir(&self) -> Filesystem {`
`442`		`- self.build_dir.clone().unwrap_or_else(\|\| self.target_dir())`
	`442`	`+ self.build_dir`
	`443`	`+ .clone()`
	`444`	`+ .or_else(\|\| self.target_dir.clone())`
	`445`	`+ .unwrap_or_else(\|\| self.default_target_dir())`
`443`	`446`	`}`
`444`	`447`
`445`	`448`	`fn default_target_dir(&self) -> Filesystem {`