Simplify workspace_root

Author: mlafeldt

crates/libduckdb-sys/build.rs

@@ -319,8 +319,7 @@ mod build_linked {
         }
 
         if should_download_libduckdb() {
-            return download_libduckdb(out_dir)
-                .unwrap_or_else(|err| panic!("Failed to download DuckDB libraries: {err}"));
+            return download_libduckdb(out_dir).unwrap_or_else(|err| panic!("Failed to download libduckdb: {err}"));
         }
 
         if let Some(header) = try_vcpkg() {
@@ -383,7 +382,7 @@ mod build_linked {
     fn download_libduckdb(out_dir: &str) -> Result<HeaderLocation, Box<dyn std::error::Error>> {
         let target = env::var("TARGET")?;
         let archive = LibduckdbArchive::for_target(&target)
-            .ok_or_else(|| format!("No prebuilt DuckDB libraries available for target '{target}'"))?;
+            .ok_or_else(|| format!("No pre-built libduckdb available for target '{target}'"))?;
 
         let version = env!("CARGO_PKG_VERSION").to_string();
 
@@ -528,22 +527,14 @@ mod build_linked {
     }
 
     fn display_path(path: &Path) -> String {
-        workspace_root()
-            .and_then(|root| path.strip_prefix(&root).ok())
+        let root = workspace_root();
+        path.strip_prefix(&root)
             .map(|p| p.display().to_string())
-            .unwrap_or_else(|| path.display().to_string())
+            .unwrap_or_else(|_| path.display().to_string())
     }
 
-    fn workspace_root() -> Option<PathBuf> {
-        env::var("CARGO_MANIFEST_DIR").ok().and_then(|manifest| {
-            let manifest_path = PathBuf::from(manifest);
-            for ancestor in manifest_path.ancestors() {
-                if ancestor.join("Cargo.lock").exists() {
-                    return Some(ancestor.to_path_buf());
-                }
-            }
-            None
-        })
+    fn workspace_root() -> PathBuf {
+        PathBuf::from(env::var("CARGO_WORKSPACE_DIR").unwrap())
     }
 
     struct LibduckdbArchive {
@@ -592,7 +583,6 @@ mod build_linked {
             .ok()
             .and_then(|value| value.parse().ok())
             .unwrap_or(90);
-
         reqwest::blocking::Client::builder()
             .timeout(std::time::Duration::from_secs(timeout))
             .build()