From 079c3be78a1a0840b8fd7759708161bb068022e7 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Mar 2026 14:19:25 -0700 Subject: [PATCH 1/5] fix: fix two build.rs compiler errors in get_lbug_root - unwrap_or_else closure must take |_| not || (VarError arg) - Command::new("tar") needs .status() before .expect() since expect is not a method on &mut Command --- build.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 58cb6e6..c18da69 100644 --- a/build.rs +++ b/build.rs @@ -78,7 +78,7 @@ fn get_lbug_root() -> PathBuf { let lbug_dir = manifest_dir.join("lbug-src"); if !lbug_dir.exists() { - let version = std::env::var("LBUG_VERSION").unwrap_or_else(|| "main".to_string()); + let version = std::env::var("LBUG_VERSION").unwrap_or_else(|_| "main".to_string()); println!("Downloading ladybug source version {version}..."); let url = if version.starts_with('v') { format!( @@ -109,6 +109,7 @@ fn get_lbug_root() -> PathBuf { std::process::Command::new("tar") .args(["-xzf", "ladybug.tar.gz", "--strip-components=1"]) .current_dir(manifest_dir) + .status() .expect("Failed to extract ladybug source"); std::fs::remove_file(manifest_dir.join("ladybug.tar.gz")).ok(); From 0deb219c4d7d58c5649a99bd5a6410927a4e113e Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Mar 2026 14:22:09 -0700 Subject: [PATCH 2/5] fix: bind CARGO_MANIFEST_DIR string before borrowing as Path --- build.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index c18da69..756055f 100644 --- a/build.rs +++ b/build.rs @@ -67,7 +67,8 @@ fn link_libraries() { } fn get_lbug_root() -> PathBuf { - let manifest_dir = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()); + let manifest_dir_str = std::env::var("CARGO_MANIFEST_DIR").unwrap(); + let manifest_dir = Path::new(&manifest_dir_str); let root = manifest_dir.join("lbug-src"); if root.is_symlink() || root.is_dir() { return root; From f774449a429909f61a582f44f92e96430a802b90 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Mar 2026 14:24:31 -0700 Subject: [PATCH 3/5] fix: extract ladybug source into lbug-src/ subdirectory --- build.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 756055f..7396713 100644 --- a/build.rs +++ b/build.rs @@ -107,8 +107,15 @@ fn get_lbug_root() -> PathBuf { panic!("Failed to download ladybug source from {}", url); } + std::fs::create_dir_all(&lbug_dir).expect("Failed to create lbug-src directory"); std::process::Command::new("tar") - .args(["-xzf", "ladybug.tar.gz", "--strip-components=1"]) + .args([ + "-xzf", + "ladybug.tar.gz", + "--strip-components=1", + "-C", + "lbug-src", + ]) .current_dir(manifest_dir) .status() .expect("Failed to extract ladybug source"); From d3fee35fda0aa0ed0f034c178cfbd8abdca57bd2 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Mar 2026 14:26:40 -0700 Subject: [PATCH 4/5] ci: remove symlink --- lbug-src | 1 - 1 file changed, 1 deletion(-) delete mode 120000 lbug-src diff --git a/lbug-src b/lbug-src deleted file mode 120000 index c25bddb..0000000 --- a/lbug-src +++ /dev/null @@ -1 +0,0 @@ -../.. \ No newline at end of file From 4eeabbdb7930bb416e50de42764ee0e1e966f2e2 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Mar 2026 14:29:07 -0700 Subject: [PATCH 5/5] fix: correct ladybug source download URL to LadybugDB/ladybug --- build.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.rs b/build.rs index 7396713..caca16d 100644 --- a/build.rs +++ b/build.rs @@ -83,14 +83,14 @@ fn get_lbug_root() -> PathBuf { println!("Downloading ladybug source version {version}..."); let url = if version.starts_with('v') { format!( - "https://github.com/lbugdb/lbug/archive/refs/tags/{}.tar.gz", + "https://github.com/LadybugDB/ladybug/archive/refs/tags/{}.tar.gz", version ) } else if version == "main" { - "https://github.com/lbugdb/lbug/archive/refs/heads/main.tar.gz".to_string() + "https://github.com/LadybugDB/ladybug/archive/refs/heads/main.tar.gz".to_string() } else { format!( - "https://github.com/lbugdb/lbug/archive/refs/tags/v{}.tar.gz", + "https://github.com/LadybugDB/ladybug/archive/refs/tags/v{}.tar.gz", version ) };