FREEZE.indexed

.cargo/config.toml

@@ -1,3 +1,6 @@
 # TODO: remove this once we're no longer compiling C++ with Rust.
 [future-incompat-report]
 frequency = "never"
+
+[alias]
+tool-run-bin = ["run", "--quiet", "--package", "cargo-bin", "--"]

Cargo.toml

@@ -6,6 +6,7 @@ members = [
   "src/rs",
   "src/rs-ffi",
   "src/rs-wasm",
+  "tools/cargo-run-bin"
 ]
 default-members = [
   "src/rs"

Makefiles/rust-ffi.Makefile

@@ -5,7 +5,7 @@
 build-rust-ffi:
 	cargo build --release --package twsearch-ffi
 	mkdir -p "./.temp"
-	cargo bin cbindgen --crate twsearch-ffi --lang c --cpp-compat --output "./.temp/twsearch-ffi.h" # TODO: install `cbindgen`
+	cargo tool-run-bin cbindgen --crate twsearch-ffi --lang c --cpp-compat --output "./.temp/twsearch-ffi.h" # TODO: install `cbindgen`
 	cat "./.temp/twsearch-ffi.h" | sed "s#\[..\];#;#g" | sed "s#\[.\];#;#g" | sed "s#const uint8_t#const char#g" > "./target/release/libtwsearch_ffi.h"
 
 .PHONY: test-rust-ffi # TODO: non-PHONY?

Makefiles/rust-wasm.Makefile

@@ -3,7 +3,7 @@
 .PHONY: build-rust-wasm
 build-rust-wasm:
 	rm -rf "./.temp/rust-wasm"
-	cargo bin wasm-pack build --release --target web --out-dir "../../.temp/rust-wasm" src/rs-wasm
+	cargo tool-run-bin wasm-pack build --release --target web --out-dir "../../.temp/rust-wasm" src/rs-wasm
 	bun run script/node-esm-compat.ts
 	bun run "./script/build-wasm-package.ts"
 

tools/cargo-run-bin/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "cargo-bin"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+
+[dependencies]
+cargo-run-bin = { version = "1.7.4", features = ["cli"] }

tools/cargo-run-bin/README.md

@@ -0,0 +1 @@
+This package must be named `cargo-bin`, because `cargo-run-bin` needs to believe its binary is `cargo-bin`: <https://github.com/dustinblackman/cargo-run-bin/issues/21#issuecomment-2600372315> (even though [`cargo-bin`](https://crates.io/crates/cargo-bin) is also a separate thing that exists).

tools/cargo-run-bin/src/main.rs

@@ -0,0 +1,17 @@
+use std::{env, process};
+
+fn main() {
+    for argument in env::args() {
+        println!("{argument}");
+    }
+    let res = cargo_run_bin::cli::run();
+
+    dbg!(&res);
+
+    // Only reached if run-bin code fails, otherwise process exits early from within
+    // binary::run.
+    if let Err(res) = res {
+        eprintln!("\x1b[31m{}\x1b[0m", format!("run-bin failed: {res}"));
+        process::exit(1);
+    }
+}