Auto merge of #617 - simao/dotslash, r=TroyKomodo

Use rules_multitool instead of bazel bindeps

Requested-by: TroyKomodo <[email protected]>
Reviewed-by: TroyKomodo <[email protected]>

Author: scuffle-brawl[bot]

.github/workflows/ci-check-fmt.yaml

@@ -35,12 +35,5 @@ jobs:
       - name: Format shfmt
         run: bazel run //tools/shfmt -- -w .
 
-      - name: Format cedar
-        run: |
-          binary=$(bazel cquery //tools/cedar --output=files --build)
-          exec_root=$(bazel info execution_root)
-          cedar="${exec_root}/${binary}"
-          git ls-files "*.cedar" | xargs ls 2>/dev/null | xargs -I {} "${cedar}" format -w -p {}
-
       - name: Exit on diff
         run: git diff --exit-code

.github/workflows/ci-check-vendor.yaml

@@ -26,8 +26,5 @@ jobs:
       - name: Vendor Cargo
         run: bazel run //vendor:cargo_vendor
 
-      - name: Vendor Bindeps
-        run: bazel run //vendor:bindeps
-
       - name: Exit on change
         run: git diff --exit-code

BUILD.bazel

@@ -17,7 +17,6 @@ bazel_env(
         "cargo": "//tools/cargo",
         "cargo-deny": "//tools/cargo/deny",
         "cargo-insta": "//tools/cargo/insta",
-        "cedar": "//tools/cedar",
         "buf": "//tools/buf",
         "buildifier": "//tools/buildifier",
         "dprint": "//tools/dprint",

Justfile

@@ -13,7 +13,6 @@ fmt:
     buf format -w --disable-symlinks --debug
     just --unstable --fmt
     shfmt -w .
-    git ls-files "*.cedar" | xargs ls 2>/dev/null | xargs -I {} cedar format -w -p {}
 
 lint:
     bazel run //tools/cargo/clippy:fix
@@ -91,7 +90,7 @@ test *targets="//...":
     #!/usr/bin/env bash
     set -exuo pipefail
 
-    cargo insta reject > /dev/null
+    cargo-insta reject > /dev/null
 
     targets=$(bazel query 'tests(set({{ targets }}))')
 
@@ -107,7 +106,7 @@ test *targets="//...":
         ln -sf "$(realpath "$snap")" "$(dirname "$rel_path")/$(basename "$rel_path")"
     done
 
-    cargo insta review
+    cargo-insta review
 
     rm lcov.info || true
     ln -s "$(bazel info output_path)"/_coverage/_coverage_report.dat lcov.info
@@ -120,7 +119,6 @@ alias vendor := lockfile
 lockfile:
     cargo update --workspace
     bazel run //vendor:cargo_vendor
-    bazel run //vendor:bindeps
     pnpm install --lockfile-only
 
 grind *targets="//...":
@@ -144,4 +142,4 @@ doc-serve: doc
     miniserve "$(bazel info execution_root)"/"$(bazel cquery --config=wrapper {{ rustdoc_target }} --output=files)" --index index.html --port 3000
 
 deny:
-    bazel run //tools/cargo/deny check
+    cargo-deny check

MODULE.bazel

@@ -13,6 +13,7 @@ bazel_dep(name = "rules_python", version = "1.5.3")
 bazel_dep(name = "rules_go", version = "0.57.0")
 bazel_dep(name = "rules_java", version = "8.15.2")
 bazel_dep(name = "bazel_features", version = "1.32.0")
+bazel_dep(name = "rules_multitool", version = "1.9.0")
 
 bazel_dep(name = "bazel_env.bzl", version = "0.5.0", dev_dependency = True)
 
@@ -28,14 +29,14 @@ include("//misc/toolchains:js.MODULE.bazel")
 
 include("//misc/toolchains:ffmpeg.MODULE.bazel")
 
-include("//misc/toolchains:ibazel.MODULE.bazel")
-
-include("//misc/toolchains:shfmt.MODULE.bazel")
-
-include("//misc/toolchains:bazel-diff.MODULE.bazel")
-
 include("//misc/toolchains:valgrind.MODULE.bazel")
 
 include("//misc/toolchains:assets.MODULE.bazel")
 
+include("//misc/toolchains:bazel-diff.MODULE.bazel")
+
 include("//misc/toolchains:openssl.MODULE.bazel")
+
+multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
+multitool.hub(lockfile = "//:multitool.lock.json")
+use_repo(multitool, "multitool")

dprint.json

@@ -6,24 +6,21 @@
         "indentWidth": 4,
         "trailingCommas": "never"
     },
-    "markdown": {
-    },
+    "markdown": {},
     "toml": {
         "indentWidth": 4
     },
-    "dockerfile": {
-    },
-    "malva": {
-    },
+    "dockerfile": {},
+    "malva": {},
     "markup": {
         "indentWidth": 4,
         "svelteAttrShorthand": true,
         "svelteDirectiveShorthand": true,
         "scriptIndent": true,
         "styleIndent": true
     },
-    "yaml": {
-    },
+    "cedar": {},
+    "yaml": {},
     "excludes": [
         "**/node_modules",
         "**/*-lock.json",
@@ -40,6 +37,7 @@
         "https://plugins.dprint.dev/g-plane/malva-v0.14.2.wasm",
         "https://plugins.dprint.dev/g-plane/markup_fmt-v0.23.2.wasm",
         "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
-        "https://plugins.dprint.dev/ruff-0.4.8.wasm"
+        "https://plugins.dprint.dev/ruff-0.4.8.wasm",
+        "https://github.com/ScuffleCloud/dprint-plugin-cedar/releases/download/commit-79d0bfa58bb082c19b8955c19159c3f81e677857/dprint_plugin_cedar.wasm"
     ]
 }

misc/toolchains/ibazel.MODULE.bazel

@@ -17,8 +17,8 @@ use_repo(npm, "npm")
 
 pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
 pnpm.pnpm(
-    pnpm_version = "10.15.0",
-    pnpm_version_integrity = "sha512-SG68JZ0+mZpOhpHOA7XKxKccvso5Nyqbdiy1AM/fCHPiyxar49lRse4s8BJQPwJ7mLZYTk3yJSTgx0UNnseqew==",
+    pnpm_version = "10.18.2",
+    pnpm_version_integrity = "sha512-n7lp+nSbOt5gNeDxCfC4pgtdCKGof99y4zfakNzJMzbiKAyk5E8jWKZJuDwXlZ6Zk+d3wggIefOAHm8NmZrT3Q==",
 )
 use_repo(pnpm, "pnpm")
 

misc/toolchains/js.MODULE.bazel

@@ -338,17 +338,3 @@ use_repo(
     "cargo_vendor__walkdir-2.5.0",
     "cargo_vendor__webauthn-rs-0.5.2",
 )
-
-bindeps = use_extension("//vendor:cargo_ext.bzl", "bindeps")
-use_repo(
-    bindeps,
-    "bindeps",
-    "bindeps__cargo-deny-0.18.4",
-    "bindeps__cargo-insta-1.43.2",
-    "bindeps__cedar-policy-cli-4.5.1",
-    "bindeps__diesel_cli-2.3.2",
-    "bindeps__dprint-0.50.2",
-    "bindeps__just-1.42.4",
-    "bindeps__miniserve-0.31.0",
-    "bindeps__rust-analyzer-0.0.0",
-)