Address review, start accomodating bzlmod.

.gitattributes

@@ -74,3 +74,7 @@ javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/auto
 
 # Auto-generated modeling for Python
 python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true
+
+# auto-generated bazel lock file
+ruby/extractor/cargo-bazel-lock.json linguist-generated=true
+ruby/extractor/cargo-bazel-lock.json -merge

ruby/BUILD.bazel

@@ -1,6 +1,6 @@
-load("@//:dist.bzl", "dist", "pack_zip")
-load("@ql//:defs.bzl", "codeql_platform")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
+load("@semmle_code//:dist.bzl", "dist", "pack_zip")
+load("//:defs.bzl", "codeql_platform")
 
 package(default_visibility = ["//visibility:public"])
 

ruby/extractor/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@//:common.bzl", "codeql_rust_binary")
 load("@ruby_deps//:defs.bzl", "aliases", "all_crate_deps")
+load("@semmle_code//:common.bzl", "codeql_rust_binary")
 
 codeql_rust_binary(
     name = "extractor",

ruby/extractor/Cargo.toml

@@ -5,11 +5,12 @@ version = "0.1.0"
 authors = ["GitHub"]
 edition = "2018"
 
-# When changing/updating these, the `Cargo.Bazel.lock` file has to be regenerated.
+# When changing/updating these, the `cargo-bazel-lock.json` file has to be regenerated.
-# Check out the documentation at https://bazelbuild.github.io/rules_rust/crate_universe.html#repinning--updating-dependencies
+# Run `CARGO_BAZEL_REPIN=true CARGO_BAZEL_REPIN_ONLY=ruby_deps ./build --bazel sync --only=ruby_deps`
-# for how to do so. The bazel repository for the ruby extractor is called `ruby_extractor_crate_index`,
+# in the `semmle-code` repository to do so.
-# and instead of calling `bazel sync`, `./build --bazel sync` should be used instead, to always use the correct bazel version.
+# For more information, check out the documentation at
-# In the future, the hope is to move this handling of the dependencies entirely into the `codeql` submodule,
+# https://bazelbuild.github.io/rules_rust/crate_universe.html#repinning--updating-dependencies
+# In the future, the hope is to move this handling of the dependencies entirely into the `codeql` repository,
 # but that depends on `rules_rust` being fully compatible with bzlmod, which they aren't yet
 # (c.f. https://github.com/bazelbuild/rules_rust/issues/2452).
 # Warning: The process takes >5min on my M1 mac, so do wait for a while.

ruby/extractor/cargo-bazel-lock.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "967967dffe2fa38c30836aad92aad831f6eaab77aac76c0710d807bc80a9b2f6",
+  "checksum": "d560c06cf4f13182656a5daa708e6278b403dfc9075fc8539b046c3cf823e3a1",
   "crates": {
     "adler 1.0.2": {
       "name": "adler",

ruby/tools/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@//:dist.bzl", "pack_zip")
+load("@semmle_code//:dist.bzl", "pack_zip")
 
 pack_zip(
     name = "tools",