From 81c366a745a467bb5d4c3b98cf0294f849141e4e Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Wed, 28 Oct 2026 14:55:12 +0100 Subject: [PATCH 1/2] Rust: Remove argfile dependency Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35193a30-9bd2-4372-a2e5-65422a7779cf --- Cargo.lock | 29 --- MODULE.bazel | 1 - .../BUILD.argfile-1.0.0.bazel | 117 ----------- .../tree_sitter_extractors_deps/BUILD.bazel | 12 -- .../BUILD.fs-err-3.3.0.bazel | 182 ------------------ .../BUILD.os_str_bytes-7.2.0.bazel | 118 ------------ .../argfile-1.0.0/BUILD.bazel | 15 -- .../argfile/BUILD.bazel | 15 -- .../tree_sitter_extractors_deps/crates.bzl | 32 --- rust/extractor/Cargo.toml | 1 - 10 files changed, 522 deletions(-) delete mode 100644 misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-1.0.0.bazel delete mode 100644 misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-3.3.0.bazel delete mode 100644 misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.2.0.bazel delete mode 100644 misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile-1.0.0/BUILD.bazel delete mode 100644 misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile/BUILD.bazel diff --git a/Cargo.lock b/Cargo.lock index 754dca177d3f..6542d60f523a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,16 +88,6 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" -[[package]] -name = "argfile" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99489a733dea0d2930bfa59c243146a8513ce7b0991b9d006647687cc61f53e7" -dependencies = [ - "fs-err", - "os_str_bytes", -] - [[package]] name = "arrayvec" version = "0.7.8" @@ -430,7 +420,6 @@ name = "codeql-rust" version = "0.1.0" dependencies = [ "anyhow", - "argfile", "chalk-ir", "chrono", "clap", @@ -822,15 +811,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" -[[package]] -name = "fs-err" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0" -dependencies = [ - "autocfg", -] - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -1387,15 +1367,6 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" -[[package]] -name = "os_str_bytes" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89284d0c2af7b0eb5e814798aa07265413c8fd72009f7fc82ea25a81fb287ce9" -dependencies = [ - "memchr", -] - [[package]] name = "parking_lot" version = "0.12.5" diff --git a/MODULE.bazel b/MODULE.bazel index 287a999232f5..041ca4c7f3f3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -106,7 +106,6 @@ use_repo( tree_sitter_extractors_deps, "vendor_ts", "vendor_ts__anyhow-1.0.104", - "vendor_ts__argfile-1.0.0", "vendor_ts__chalk-ir-0.104.0", "vendor_ts__chrono-0.4.45", "vendor_ts__clap-4.6.7", diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-1.0.0.bazel deleted file mode 100644 index baae4d331abe..000000000000 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-1.0.0.bazel +++ /dev/null @@ -1,117 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars") -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -cargo_toml_env_vars( - name = "cargo_toml_env_vars", - src = "Cargo.toml", -) - -rust_library( - name = "argfile", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - edition = "2021", - rustc_env_files = [ - ":cargo_toml_env_vars", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=argfile", - "manual", - "noclippy", - "norustfmt", - ], - target_compatible_with = select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [], - "@rules_rust//rust/platform:aarch64-apple-ios": [], - "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], - "@rules_rust//rust/platform:aarch64-linux-android": [], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], - "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-none": [], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [], - "@rules_rust//rust/platform:aarch64-unknown-uefi": [], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], - "@rules_rust//rust/platform:armv7-linux-androideabi": [], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:i686-apple-darwin": [], - "@rules_rust//rust/platform:i686-linux-android": [], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [], - "@rules_rust//rust/platform:i686-unknown-freebsd": [], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], - "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:mips-unknown-linux-gnu": [], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-netbsd": [], - "@rules_rust//rust/platform:sparc64-unknown-openbsd": [], - "@rules_rust//rust/platform:thumbv6m-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], - "@rules_rust//rust/platform:thumbv7m-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [], - "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [], - "@rules_rust//rust/platform:wasm32-wasip1": [], - "@rules_rust//rust/platform:wasm32-wasip1-threads": [], - "@rules_rust//rust/platform:wasm32-wasip2": [], - "@rules_rust//rust/platform:x86_64-apple-darwin": [], - "@rules_rust//rust/platform:x86_64-apple-ios": [], - "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], - "@rules_rust//rust/platform:x86_64-linux-android": [], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [], - "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-none": [], - "@rules_rust//rust/platform:x86_64-unknown-uefi": [], - "//conditions:default": ["@platforms//:incompatible"], - }), - version = "1.0.0", - deps = [ - "@vendor_ts__fs-err-3.3.0//:fs_err", - "@vendor_ts__os_str_bytes-7.2.0//:os_str_bytes", - ], -) diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel index 700bb9238b50..377f236a841b 100644 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel +++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel @@ -43,18 +43,6 @@ alias( tags = ["manual"], ) -alias( - name = "argfile-1.0.0", - actual = "@vendor_ts__argfile-1.0.0//:argfile", - tags = ["manual"], -) - -alias( - name = "argfile", - actual = "@vendor_ts__argfile-1.0.0//:argfile", - tags = ["manual"], -) - alias( name = "chalk-ir-0.104.0", actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir", diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-3.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-3.3.0.bazel deleted file mode 100644 index 4e54c0df3877..000000000000 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-3.3.0.bazel +++ /dev/null @@ -1,182 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors -############################################################################### - -load( - "@rules_rust//cargo:defs.bzl", - "cargo_build_script", - "cargo_toml_env_vars", -) -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -cargo_toml_env_vars( - name = "cargo_toml_env_vars", - src = "Cargo.toml", -) - -rust_library( - name = "fs_err", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2018", - rustc_env_files = [ - ":cargo_toml_env_vars", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=fs-err", - "manual", - "noclippy", - "norustfmt", - ], - target_compatible_with = select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [], - "@rules_rust//rust/platform:aarch64-apple-ios": [], - "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], - "@rules_rust//rust/platform:aarch64-linux-android": [], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], - "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-none": [], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [], - "@rules_rust//rust/platform:aarch64-unknown-uefi": [], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], - "@rules_rust//rust/platform:armv7-linux-androideabi": [], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:i686-apple-darwin": [], - "@rules_rust//rust/platform:i686-linux-android": [], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [], - "@rules_rust//rust/platform:i686-unknown-freebsd": [], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], - "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:mips-unknown-linux-gnu": [], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-netbsd": [], - "@rules_rust//rust/platform:sparc64-unknown-openbsd": [], - "@rules_rust//rust/platform:thumbv6m-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], - "@rules_rust//rust/platform:thumbv7m-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [], - "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [], - "@rules_rust//rust/platform:wasm32-wasip1": [], - "@rules_rust//rust/platform:wasm32-wasip1-threads": [], - "@rules_rust//rust/platform:wasm32-wasip2": [], - "@rules_rust//rust/platform:x86_64-apple-darwin": [], - "@rules_rust//rust/platform:x86_64-apple-ios": [], - "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], - "@rules_rust//rust/platform:x86_64-linux-android": [], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [], - "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-none": [], - "@rules_rust//rust/platform:x86_64-unknown-uefi": [], - "//conditions:default": ["@platforms//:incompatible"], - }), - version = "3.3.0", - deps = [ - ":build_script_build", - ], -) - -cargo_build_script( - name = "_bs", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - build_script_env_files = [ - ":cargo_toml_env_vars", - ], - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - "**/*.rs", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_name = "build_script_build", - crate_root = "build.rs", - data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - edition = "2018", - emit_warnings = False, - pkg_name = "fs-err", - rustc_env_files = [ - ":cargo_toml_env_vars", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=fs-err", - "manual", - "noclippy", - "norustfmt", - ], - version = "3.3.0", - visibility = ["//visibility:private"], - deps = [ - "@vendor_ts__autocfg-1.5.1//:autocfg", - ], -) - -alias( - name = "build_script_build", - actual = ":_bs", - tags = ["manual"], -) diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.2.0.bazel deleted file mode 100644 index c2a1a09be7ac..000000000000 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.2.0.bazel +++ /dev/null @@ -1,118 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars") -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -cargo_toml_env_vars( - name = "cargo_toml_env_vars", - src = "Cargo.toml", -) - -rust_library( - name = "os_str_bytes", - srcs = glob( - include = ["**/*.rs"], - allow_empty = True, - ), - compile_data = glob( - include = ["**"], - allow_empty = True, - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_features = [ - "default", - "memchr", - "raw_os_str", - ], - crate_root = "src/lib.rs", - edition = "2021", - rustc_env_files = [ - ":cargo_toml_env_vars", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=os_str_bytes", - "manual", - "noclippy", - "norustfmt", - ], - target_compatible_with = select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [], - "@rules_rust//rust/platform:aarch64-apple-ios": [], - "@rules_rust//rust/platform:aarch64-apple-ios-macabi": [], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], - "@rules_rust//rust/platform:aarch64-linux-android": [], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], - "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-none": [], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [], - "@rules_rust//rust/platform:aarch64-unknown-uefi": [], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], - "@rules_rust//rust/platform:armv7-linux-androideabi": [], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:i686-apple-darwin": [], - "@rules_rust//rust/platform:i686-linux-android": [], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [], - "@rules_rust//rust/platform:i686-unknown-freebsd": [], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], - "@rules_rust//rust/platform:loongarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:mips-unknown-linux-gnu": [], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv32imac-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:sparc64-unknown-netbsd": [], - "@rules_rust//rust/platform:sparc64-unknown-openbsd": [], - "@rules_rust//rust/platform:thumbv6m-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabi": [], - "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], - "@rules_rust//rust/platform:thumbv7m-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabihf": [], - "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [], - "@rules_rust//rust/platform:wasm32-wasip1": [], - "@rules_rust//rust/platform:wasm32-wasip1-threads": [], - "@rules_rust//rust/platform:wasm32-wasip2": [], - "@rules_rust//rust/platform:x86_64-apple-darwin": [], - "@rules_rust//rust/platform:x86_64-apple-ios": [], - "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], - "@rules_rust//rust/platform:x86_64-linux-android": [], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [], - "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-none": [], - "@rules_rust//rust/platform:x86_64-unknown-uefi": [], - "//conditions:default": ["@platforms//:incompatible"], - }), - version = "7.2.0", - deps = [ - "@vendor_ts__memchr-2.8.3//:memchr", - ], -) diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile-1.0.0/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile-1.0.0/BUILD.bazel deleted file mode 100644 index d9f4480097d6..000000000000 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile-1.0.0/BUILD.bazel +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors -############################################################################### - -package(default_visibility = ["//visibility:public"]) - -alias( - name = "argfile-1.0.0", - actual = "@vendor_ts__argfile-1.0.0//:argfile", - tags = ["manual"], -) diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile/BUILD.bazel deleted file mode 100644 index 308c6689fa8e..000000000000 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/argfile/BUILD.bazel +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors -############################################################################### - -package(default_visibility = ["//visibility:public"]) - -alias( - name = "argfile", - actual = "@vendor_ts__argfile-1.0.0//:argfile", - tags = ["manual"], -) diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl index da875007ceff..cc0e1854084a 100644 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl +++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl @@ -360,7 +360,6 @@ _NORMAL_DEPENDENCIES = { "rust/extractor": { _COMMON_CONDITION: { "anyhow": Label("@vendor_ts//anyhow-1.0.104"), - "argfile": Label("@vendor_ts//argfile-1.0.0"), "chalk-ir": Label("@vendor_ts//chalk-ir-0.104.0"), "chrono": Label("@vendor_ts//chrono-0.4.45"), "clap": Label("@vendor_ts//clap-4.6.7"), @@ -983,16 +982,6 @@ def crate_repositories(): build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.104.bazel"), ) - maybe( - http_archive, - name = "vendor_ts__argfile-1.0.0", - sha256 = "99489a733dea0d2930bfa59c243146a8513ce7b0991b9d006647687cc61f53e7", - type = "tar.gz", - urls = ["https://static.crates.io/crates/argfile/1.0.0/download"], - strip_prefix = "argfile-1.0.0", - build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.argfile-1.0.0.bazel"), - ) - maybe( http_archive, name = "vendor_ts__arrayvec-0.7.8", @@ -1693,16 +1682,6 @@ def crate_repositories(): build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.foldhash-0.2.0.bazel"), ) - maybe( - http_archive, - name = "vendor_ts__fs-err-3.3.0", - sha256 = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0", - type = "tar.gz", - urls = ["https://static.crates.io/crates/fs-err/3.3.0/download"], - strip_prefix = "fs-err-3.3.0", - build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.fs-err-3.3.0.bazel"), - ) - maybe( http_archive, name = "vendor_ts__fsevent-sys-4.1.0", @@ -2343,16 +2322,6 @@ def crate_repositories(): build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.oorandom-11.1.5.bazel"), ) - maybe( - http_archive, - name = "vendor_ts__os_str_bytes-7.2.0", - sha256 = "89284d0c2af7b0eb5e814798aa07265413c8fd72009f7fc82ea25a81fb287ce9", - type = "tar.gz", - urls = ["https://static.crates.io/crates/os_str_bytes/7.2.0/download"], - strip_prefix = "os_str_bytes-7.2.0", - build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.os_str_bytes-7.2.0.bazel"), - ) - maybe( http_archive, name = "vendor_ts__parking_lot-0.12.5", @@ -4056,7 +4025,6 @@ def crate_repositories(): return [ struct(repo = "vendor_ts", is_dev_dep = False), struct(repo = "vendor_ts__anyhow-1.0.104", is_dev_dep = False), - struct(repo = "vendor_ts__argfile-1.0.0", is_dev_dep = False), struct(repo = "vendor_ts__chalk-ir-0.104.0", is_dev_dep = False), struct(repo = "vendor_ts__chrono-0.4.45", is_dev_dep = False), struct(repo = "vendor_ts__clap-4.6.7", is_dev_dep = False), diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml index e2c99350cace..8c193112faef 100644 --- a/rust/extractor/Cargo.toml +++ b/rust/extractor/Cargo.toml @@ -30,7 +30,6 @@ ra_ap_intern = "0.0.358" serde = "1.0.229" serde_with = "3.24.0" triomphe = "0.1.17" -argfile = "1.0.0" codeql-extractor = { path = "../../shared/tree-sitter-extractor" } rust-extractor-macros = { path = "macros" } itertools = "0.15.0" From 08eff933779b768746269d968e6d20a8466a970c Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Wed, 28 Oct 2026 14:55:14 +0100 Subject: [PATCH 2/2] Rust: Read extraction inputs from an explicit file list Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35193a30-9bd2-4372-a2e5-65422a7779cf --- rust/extractor/macros/src/lib.rs | 18 +++--------------- rust/extractor/src/config.rs | 6 ++---- rust/extractor/src/main.rs | 24 ++++++++++++++++++------ rust/extractor/src/qltest.rs | 15 +++++++-------- rust/tools/index-files.cmd | 3 ++- rust/tools/index-files.sh | 3 ++- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/rust/extractor/macros/src/lib.rs b/rust/extractor/macros/src/lib.rs index 5ba496d4661d..274c65275c58 100644 --- a/rust/extractor/macros/src/lib.rs +++ b/rust/extractor/macros/src/lib.rs @@ -20,9 +20,7 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea .iter() .map(|f| { let ty_tip = get_type_tip(&f.ty); - if f.ident.as_ref().is_some_and(|i| i != "inputs") - && ty_tip.is_some_and(|i| i == "Vec") - { + if ty_tip.is_some_and(|i| i == "Vec") { quote! { #[serde(deserialize_with="deserialize::deserialize_newline_or_comma_separated_vec")] #f @@ -62,10 +60,6 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea #[serde(skip_serializing_if="u8::is_zero")] #id: u8 } - } else if id == &format_ident!("inputs") { - quote! { - #f - } } else if type_tip.is_some_and(|i| i == "Vec" || i == "FxHashMap" || i == "HashMap") { quote! { #[arg(long)] @@ -84,14 +78,8 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea .iter() .map(|f| { let id = f.ident.as_ref().unwrap(); - if id == &format_ident!("inputs") { - quote! { - .field("number of inputs", &self.#id.len()) - } - } else { - quote! { - .field(stringify!(#id), &self.#id) - } + quote! { + .field(stringify!(#id), &self.#id) } }) .collect::>(); diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs index 81e42c552c82..88f7ada715c6 100644 --- a/rust/extractor/src/config.rs +++ b/rust/extractor/src/config.rs @@ -62,7 +62,7 @@ pub struct Config { pub logging_flamegraph: Option, pub logging_verbosity: Option, pub trap_compression: Compression, - pub inputs: Vec, + pub file_list: Option, pub qltest: bool, pub qltest_cargo_check: bool, pub qltest_dependencies: Vec, @@ -95,9 +95,7 @@ impl Config { } pub fn extract() -> anyhow::Result { - let args = argfile::expand_args(argfile::parse_fromfile, argfile::PREFIX) - .context("expanding parameter files")?; - let cli_args = CliConfig::parse_from(args); + let cli_args = CliConfig::parse(); let mut figment = Figment::new() .merge(Env::raw().filter_map(|f| { if f.eq("CODEQL_VERBOSITY") { diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs index 72b6f20c9fb0..f07c6bdc5f5e 100644 --- a/rust/extractor/src/main.rs +++ b/rust/extractor/src/main.rs @@ -15,7 +15,9 @@ use ra_ap_project_model::{CargoConfig, ProjectManifest}; use ra_ap_vfs::Vfs; use rust_analyzer::{ParseResult, RustAnalyzer}; use std::collections::HashSet; +use std::fs::File; use std::hash::RandomState; +use std::io::{self, BufRead, BufReader}; use std::time::Instant; use std::{ collections::HashMap, @@ -212,10 +214,20 @@ fn cwd() -> anyhow::Result { } fn main() -> anyhow::Result<()> { - let mut cfg = config::Config::extract().context("failed to load configuration")?; - if cfg.qltest { - qltest::prepare(&mut cfg)?; - } + let cfg = config::Config::extract().context("failed to load configuration")?; + let inputs = if cfg.qltest { + qltest::prepare(&cfg)? + } else if let Some(path) = &cfg.file_list { + let file = + File::open(path).with_context(|| format!("opening file list {}", path.display()))?; + BufReader::new(file) + .lines() + .map(|line| line.map(PathBuf::from)) + .collect::>>() + .with_context(|| format!("reading file list {}", path.display()))? + } else { + Vec::new() + }; let start = Instant::now(); let (flame_layer, _flush_guard) = if let Some(path) = &cfg.logging_flamegraph { tracing_flame::FlameLayer::with_file(path) @@ -234,14 +246,14 @@ fn main() -> anyhow::Result<()> { .with(flame_layer) .init(); info!("{cfg:#?}\n"); + info!("number of inputs: {}", inputs.len()); let traps = trap::TrapFileProvider::new(&cfg).context("failed to set up trap files")?; let archiver = archive::Archiver { root: cfg.source_archive_dir.clone(), }; let mut extractor = Extractor::new(&archiver, &traps); - let files: Vec = cfg - .inputs + let files: Vec = inputs .iter() .map(|file| { let file = std::path::absolute(file).unwrap_or(file.to_path_buf()); diff --git a/rust/extractor/src/qltest.rs b/rust/extractor/src/qltest.rs index a4f06bbd7927..e90fc5e91c10 100644 --- a/rust/extractor/src/qltest.rs +++ b/rust/extractor/src/qltest.rs @@ -4,7 +4,7 @@ use glob::glob; use itertools::Itertools; use std::ffi::OsStr; use std::fs; -use std::path::Path; +use std::path::{Path, PathBuf}; use tracing::info; const DEFAULT_EDITION: &str = "2021"; @@ -80,13 +80,12 @@ fn dump_nightly_toolchain() -> anyhow::Result<()> { Ok(()) } -fn set_sources(config: &mut Config) -> anyhow::Result<()> { +fn get_sources() -> anyhow::Result> { let path_iterator = glob("**/*.rs").context("globbing test sources")?; - config.inputs = path_iterator + path_iterator .filter(|f| f.is_err() || !f.as_ref().unwrap().starts_with("target")) .collect::, _>>() - .context("fetching test sources")?; - Ok(()) + .context("fetching test sources") } fn cargo_check(config: &Config) -> anyhow::Result<()> { @@ -105,9 +104,9 @@ fn cargo_check(config: &Config) -> anyhow::Result<()> { } } -pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> { +pub(crate) fn prepare(config: &Config) -> anyhow::Result> { dump_lib()?; - set_sources(config)?; + let inputs = get_sources()?; let edition = config.qltest_edition.as_deref().unwrap_or(DEFAULT_EDITION); dump_cargo_manifest(&config.qltest_dependencies, edition)?; if config.qltest_use_nightly { @@ -116,5 +115,5 @@ pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> { if config.qltest_cargo_check { cargo_check(config)?; } - Ok(()) + Ok(inputs) } diff --git a/rust/tools/index-files.cmd b/rust/tools/index-files.cmd index 3991f30b62f8..3ac364743c45 100644 --- a/rust/tools/index-files.cmd +++ b/rust/tools/index-files.cmd @@ -1,5 +1,6 @@ @echo off -type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" @"%1" +type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" ^ + --file-list "%1" exit /b %ERRORLEVEL% diff --git a/rust/tools/index-files.sh b/rust/tools/index-files.sh index bb8d665adfcc..e3e16846855c 100755 --- a/rust/tools/index-files.sh +++ b/rust/tools/index-files.sh @@ -3,4 +3,5 @@ set -eu export RUST_BACKTRACE=1 -exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" @"$1" +exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" \ + --file-list "$1"