Merge pull request #18822 from bryceberger/targetdir-absolute

Veykril · web-flow · commit 70ba3b56ff99 · 2025-01-03T11:33:57.000Z
allow targetDir to be an absolute path
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
@@ -2129,8 +2129,7 @@ impl Config {
                 Some(Utf8PathBuf::from("target/rust-analyzer"))
             }
             TargetDirectory::UseSubdirectory(false) => None,
-            TargetDirectory::Directory(dir) if dir.is_relative() => Some(dir.clone()),
-            TargetDirectory::Directory(_) => None,
+            TargetDirectory::Directory(dir) => Some(dir.clone()),
         })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2129,8 +2129,7 @@ impl Config {`
`2129`	`2129`	`Some(Utf8PathBuf::from("target/rust-analyzer"))`
`2130`	`2130`	`}`
`2131`	`2131`	`TargetDirectory::UseSubdirectory(false) => None,`
`2132`		`- TargetDirectory::Directory(dir) if dir.is_relative() => Some(dir.clone()),`
`2133`		`- TargetDirectory::Directory(_) => None,`
	`2132`	`+ TargetDirectory::Directory(dir) => Some(dir.clone()),`
`2134`	`2133`	`})`
`2135`	`2134`	`}`
`2136`	`2135`