use system cargo in bazel, use concrete paths to search for files in bazel

Author: slbotbm

.github/actions/cpp-bazel/pre-merge/action.yml

@@ -29,6 +29,9 @@ runs:
     - name: Setup Bazel with cache
       uses: ./.github/actions/utils/setup-cpp-with-cache
 
+    - name: Setup Rust with cache
+      uses: ./.github/actions/utils/setup-rust-with-cache
+
     - name: Install clang-format
       if: inputs.task == 'lint'
       shell: bash

foreign/cpp/BUILD.bazel

@@ -24,9 +24,6 @@ genrule(
         "Cargo.lock",
         "build.rs",
     ],
-    tools = [
-        "@rules_rust//tools/upstream_wrapper:cargo",
-    ],
     outs = [
         "libiggy_cpp.a",
         "include/lib.rs.h",
@@ -35,7 +32,6 @@ genrule(
     cmd = """
         set -e
 
-        CARGO="$$(pwd)/$(execpath @rules_rust//tools/upstream_wrapper:cargo)"
         OUT_LIB="$$(pwd)/$(location libiggy_cpp.a)"
         OUT_RS="$$(pwd)/$(location include/lib.rs.h)"
         OUT_CXX="$$(pwd)/$(location cxxbridge/rust/cxx.h)"
@@ -50,11 +46,24 @@ genrule(
             FLAGS="--release"
         fi
 
-        env -u PWD CARGO_TARGET_DIR="target" "$$CARGO" build $$FLAGS --locked
+        command -v cargo >/dev/null 2>&1 || { echo "cargo not found in PATH" >&2; exit 1; }
+        env -u PWD CARGO_TARGET_DIR="target" cargo build $$FLAGS --locked
+
+        CARGO_TARGET_DIR="target"
+        RUST_LIB="$$CARGO_TARGET_DIR/$$PROFILE/libiggy_cpp.a"
+        RS_HEADER="$$CARGO_TARGET_DIR/cxxbridge/iggy-cpp/src/lib.rs.h"
+        CXX_HEADER="$$CARGO_TARGET_DIR/cxxbridge/rust/cxx.h"
+
+        [ -f "$$RUST_LIB" ] || { echo "Rust static library not found at $$RUST_LIB" >&2; exit 1; }
+        [ -f "$$RS_HEADER" ] || { echo "cxxbridge header file not found at $$RS_HEADER" >&2; exit 1; }
+        if [ ! -f "$$CXX_HEADER" ] && [ ! -L "$$CXX_HEADER" ]; then
+            echo "cxx.h not found at $$CXX_HEADER" >&2
+            exit 1
+        fi
 
-        cp "target/$$PROFILE/libiggy_cpp.a" "$$OUT_LIB"
-        find "target/$$PROFILE/build" -name lib.rs.h | head -n 1 | xargs -I{} cp {} "$$OUT_RS"
-        find "target/$$PROFILE/build" -name cxx.h    | head -n 1 | xargs -I{} cp {} "$$OUT_CXX"
+        cp "$$RUST_LIB" "$$OUT_LIB"
+        cp "$$RS_HEADER" "$$OUT_RS"
+        cp -L "$$CXX_HEADER" "$$OUT_CXX"
     """,
     local = 1,
 )

foreign/cpp/MODULE.bazel

@@ -20,13 +20,5 @@ module(
 )
 
 bazel_dep(name = "rules_cc", version = "0.2.16")
-bazel_dep(name = "rules_rust", version = "0.68.1")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "googletest", version = "1.17.0")
-
-rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
-rust.toolchain(
-    edition = "2024",
-    versions = ["1.93.0"],
-)
-use_repo(rust, "rust_toolchains")

foreign/cpp/MODULE.bazel.lock

@@ -41,11 +41,11 @@ while [[ $# -gt 0 ]]; do
         --help|-h)
             echo "Usage: $0 [--check|--fix]"
             echo ""
-            echo "Sync Rust version from rust-toolchain.toml to all Dockerfiles and Bazel MODULE files"
+            echo "Sync Rust version from rust-toolchain.toml to all Dockerfiles"
             echo ""
             echo "Options:"
-            echo "  --check    Check if all Dockerfiles and MODULE files have the correct Rust version"
-            echo "  --fix      Update all Dockerfiles and MODULE files to use the correct Rust version"
+            echo "  --check    Check if all Dockerfiles have the correct Rust version"
+            echo "  --fix      Update all Dockerfiles to use the correct Rust version"
             echo "  --help     Show this help message"
             exit 0
             ;;
@@ -84,7 +84,6 @@ echo ""
 
 # Find all Dockerfiles
 DOCKERFILES=$(find . -name "Dockerfile*" -type f | grep -v node_modules | grep -v target | sort)
-MODULE_FILE="foreign/cpp/MODULE.bazel"
 
 # Track misaligned files
 MISALIGNED_FILES=()
@@ -121,35 +120,12 @@ for dockerfile in $DOCKERFILES; do
     fi
 done
 
-if [ -f "$MODULE_FILE" ] && grep -q 'versions = \["' "$MODULE_FILE" 2>/dev/null; then
-    TOTAL_FILES=$((TOTAL_FILES + 1))
-
-    CURRENT_VERSION=$(grep 'versions = \["' "$MODULE_FILE" | head -1 | sed -E 's/.*versions = \["([^"]+)"\].*/\1/')
-
-    if [ "$MODE" = "check" ]; then
-        if [ "$CURRENT_VERSION" != "$RUST_VERSION" ]; then
-            MISALIGNED_FILES+=("$MODULE_FILE")
-            echo -e "${RED}✗${NC} $MODULE_FILE: ${RED}$CURRENT_VERSION${NC} (expected: ${GREEN}$RUST_VERSION${NC})"
-        else
-            echo -e "${GREEN}✓${NC} $MODULE_FILE: $CURRENT_VERSION"
-        fi
-    elif [ "$MODE" = "fix" ]; then
-        if [ "$CURRENT_VERSION" != "$RUST_VERSION" ]; then
-            sed -i -E "s/(versions = \\[\")[^\"]+(\"\\])/\1$RUST_VERSION\2/" "$MODULE_FILE"
-            FIXED_FILES=$((FIXED_FILES + 1))
-            echo -e "${GREEN}Fixed${NC} $MODULE_FILE: ${RED}$CURRENT_VERSION${NC} -> ${GREEN}$RUST_VERSION${NC}"
-        else
-            echo -e "${GREEN}✓${NC} $MODULE_FILE: already correct ($RUST_VERSION)"
-        fi
-    fi
-fi
-
 echo ""
 echo "────────────────────────────────────────────────"
 
 if [ "$MODE" = "check" ]; then
     if [ ${#MISALIGNED_FILES[@]} -eq 0 ]; then
-        echo -e "${GREEN}✓ All $TOTAL_FILES files are aligned with Rust versions (Dockerfiles: $RUST_VERSION_SHORT, MODULE files: $RUST_VERSION)${NC}"
+        echo -e "${GREEN}✓ All $TOTAL_FILES files are aligned with Rust version (Dockerfiles: $RUST_VERSION_SHORT)${NC}"
         exit 0
     else
         echo -e "${RED}✗ Found ${#MISALIGNED_FILES[@]} misaligned file(s) out of $TOTAL_FILES:${NC}"
@@ -162,9 +138,9 @@ if [ "$MODE" = "check" ]; then
     fi
 elif [ "$MODE" = "fix" ]; then
     if [ $FIXED_FILES -eq 0 ]; then
-        echo -e "${GREEN}✓ All $TOTAL_FILES files were already aligned with Rust versions (Dockerfiles: $RUST_VERSION_SHORT, MODULE files: $RUST_VERSION)${NC}"
+        echo -e "${GREEN}✓ All $TOTAL_FILES files were already aligned with Rust version (Dockerfiles: $RUST_VERSION_SHORT)${NC}"
     else
-        echo -e "${GREEN}✓ Fixed $FIXED_FILES out of $TOTAL_FILES files to use Rust versions (Dockerfiles: $RUST_VERSION_SHORT, MODULE files: $RUST_VERSION)${NC}"
+        echo -e "${GREEN}✓ Fixed $FIXED_FILES out of $TOTAL_FILES files to use Rust version (Dockerfiles: $RUST_VERSION_SHORT)${NC}"
     fi
     exit 0
 fi