From a6359e45919380c7e49e36e281d93df03386ebb8 Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Mon, 16 Nov 2026 11:38:47 +0100 Subject: [PATCH 1/4] Update the Rust development toolchain to 1.100.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 80b98bd34610..cb51e64a0984 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -5,6 +5,6 @@ # reflected by `MODULE.bazel` in this repository). [toolchain] -channel = "1.98" +channel = "1.100.0" profile = "minimal" components = [ "clippy", "rustfmt" ] From ee799c648c08c5c77b1db8ab7dd31c88611b447a Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Mon, 16 Nov 2026 08:55:41 +0100 Subject: [PATCH 2/4] Bazel: Update the Rust nightly toolchain to 2026-11-16 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7f912f98-5361-47d2-b1f3-46af0843e5e0 --- MODULE.bazel | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4633b297e47a..5fdb1bebe9fe 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -66,7 +66,7 @@ RUST_EDITION = "2024" # a nightly toolchain is required to enable experimental_use_cc_common_link, which we require internally # we prefer to run the same version as internally, even if experimental_use_cc_common_link is not really # required in this repo -RUST_VERSION = "nightly/2026-09-03" +RUST_VERSION = "nightly/2026-11-16" rust = use_extension("@rules_rust//rust:extensions.bzl", "rust") rust.toolchain( @@ -78,26 +78,31 @@ rust.toolchain( ], # generated by buildutils-internal/scripts/fill-rust-sha256s.py (internal repo) sha256s = { - "2026-09-03/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "bd1f0986150596835e808635d81786c60ab9da3981687dfb00918329925e837a", - "2026-09-03/rustc-nightly-x86_64-apple-darwin.tar.xz": "8f3da4fcdaf5c8574f723ee0dab80c0e47e59e97fb55c1b84a1dc96dc2b90f6b", - "2026-09-03/rustc-nightly-aarch64-apple-darwin.tar.xz": "ef4e9dda67ee052fb60b506f76a5dbd2f1c45822aec878b31b98c2fe75ab6f84", - "2026-09-03/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "b2feb930850f69c40c4fc4658a054676de9a3c263b6e1afbdad86b61ab0940ef", - "2026-09-03/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "9715b53a8e80261f85eeddc6096e82e6038218ddd81e9fd8d7d5d558d076191b", - "2026-09-03/clippy-nightly-x86_64-apple-darwin.tar.xz": "83b26f9becd27e65b822a70d2f0ca1b676e0bad3d7a99597adf65326692744bb", - "2026-09-03/clippy-nightly-aarch64-apple-darwin.tar.xz": "51708a4c7399d2a71e5fcaa491a9e233e63c98f67dcad7bbe11fd164ba604690", - "2026-09-03/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "2990517d181ffe467505070d8842ae63089b781addedffa296100d018b746979", - "2026-09-03/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "a60615509715996b8d4d54b30a7db8a1cd62400d06206dbeeb20b223ad1e6b34", - "2026-09-03/cargo-nightly-x86_64-apple-darwin.tar.xz": "1650d406de2cef5d7b0d573fa131937a09559c33b03766380fb3b97eb30b2493", - "2026-09-03/cargo-nightly-aarch64-apple-darwin.tar.xz": "058ced0d2b26cde728a0553a572c0895cbbc5bdaaf23dc995649737cb2dd043d", - "2026-09-03/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "1ce268af2f3e143b4a4aa114cfcead7091659af7b36660b007652b1f34329dff", - "2026-09-03/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "c4557aaddd0b4a65593bd1f8474322fe3d91e5cc41a0221f383a8780256ad102", - "2026-09-03/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "47d0e8184d270c223c298a227b0485afcfa5dc70429f5454b472a8b69ca03e9c", - "2026-09-03/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "141b1f097db3a292f8641fe6e4ec1e48edb758154a2defa2dbd4a088af72caf7", - "2026-09-03/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "f6bb9e1cabc5b790bd419b7fe18c7ff132a40d0ff2db794efd2d5f4c0b535ba0", - "2026-09-03/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "7bfd37eda0920b04ef50b4785475c5fa2cea8df19c24f3879d0b5cac6e4dcdbc", - "2026-09-03/rust-std-nightly-x86_64-apple-darwin.tar.xz": "462e83115594799aff5d77a221b29a59d5e166435773c8eae37d047a8a5f39e1", - "2026-09-03/rust-std-nightly-aarch64-apple-darwin.tar.xz": "79f676f8265e332ece71eea226a3a9b124506c9460e758ca1f669f80e0336eb0", - "2026-09-03/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "075661d74da5a65b8d5c8adb9375a868fea80d5b0e5c131af6f4cd059d6b3113", + "2026-11-16/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "90e35c581d3682312c034457175b22da108c7131ee109fe44dd3482c4576cfde", + "2026-11-16/rustc-nightly-aarch64-unknown-linux-gnu.tar.xz": "9dc5aff057121ad899a2dadd97fc74a592abe7cf5e0c25265b1f3cb609d76b91", + "2026-11-16/rustc-nightly-x86_64-apple-darwin.tar.xz": "a662da9f793ff24a7ee682762b23cf24b3627b9a7e7dffe5db8908315fd3e6e3", + "2026-11-16/rustc-nightly-aarch64-apple-darwin.tar.xz": "0f8f7876334f1d3919d3df404f9325c8c889f55fa3af11f1a684cd3113c67d2e", + "2026-11-16/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "1d99629c90c2d6562ef235ec80498dce60e0072f89a5ebc1b10db924ac99ee97", + "2026-11-16/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "df76d8955775ce82f66c02702b0be06ee0f9fb0cd5e473ecae3eef41d8ae4555", + "2026-11-16/clippy-nightly-aarch64-unknown-linux-gnu.tar.xz": "4ad0d38dcdc3911ccdfc0ffd1d5d2af26a35db2d138f08cdafd46b37dbe17686", + "2026-11-16/clippy-nightly-x86_64-apple-darwin.tar.xz": "44cdf42ef397f496b9e54a8f05aec48ff7b91eb0a3f32fc7ad9038c5862e8b6a", + "2026-11-16/clippy-nightly-aarch64-apple-darwin.tar.xz": "82525958de86972025f8c5e6cef766a57ec314431d4793d57a9410960bd565b0", + "2026-11-16/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "8ed5488abf5e0cba9b072e94eda4f65055961caaaf5b856c6b359488382d9647", + "2026-11-16/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "53dc95e6912a58ae1106a6c59b6e2c48d790cbee81dd379246097ee547966609", + "2026-11-16/cargo-nightly-aarch64-unknown-linux-gnu.tar.xz": "47ccde54a8ad148dc81e7bb21afff6a2f33fd3a470fb1619f242352311b987f2", + "2026-11-16/cargo-nightly-x86_64-apple-darwin.tar.xz": "0871c6c02a0cdecace9a9b1900ddd09fa3d68eada8978092215563fee6a90ac8", + "2026-11-16/cargo-nightly-aarch64-apple-darwin.tar.xz": "de91015a0ea0e4c214533cfa2cc45ed7096ca51271d5cc1010480a37c91582c8", + "2026-11-16/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "26c524463a17b1c23a8d9702b0ecd9f3ce80df925bee82ccb57b5907ad7b2531", + "2026-11-16/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "fd8f660bf335589b1832bbfe916f2910f8b7a0f2c56184ada2107702906c4c05", + "2026-11-16/llvm-tools-nightly-aarch64-unknown-linux-gnu.tar.xz": "8db17f84a81d1436800e0b68fc283f8f6579d4c95742213ffcd3628588e6cfbe", + "2026-11-16/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "d92245eefb9ae22c733a442558832ec0931546771e6208b122928e62ff1d7c3a", + "2026-11-16/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "4ae6a414e865013b9f95fa809731256c99083792b4050eeeb89f9d5883940397", + "2026-11-16/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "c522c1753a09d981bbe60c206a5d24bdb52f8d65b9c7a3d58dd2122ec416777e", + "2026-11-16/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "bccc1908eba778097f1dfefad48fab6394395d8568294a8243385ad73c802b8d", + "2026-11-16/rust-std-nightly-aarch64-unknown-linux-gnu.tar.xz": "5beb58d3b7b3993df4298ec3388654c7ab7a96a0c0f75e9f54d1b4323e95306a", + "2026-11-16/rust-std-nightly-x86_64-apple-darwin.tar.xz": "8f5bb31f2679f986063c100ddc3f05d1f0725460cb2158daa11099ae447e6796", + "2026-11-16/rust-std-nightly-aarch64-apple-darwin.tar.xz": "9c3b4b2b0d10b3c1c6a51155b017bbb04f93cb9fe7ff0ba413d69da5c9a0d34c", + "2026-11-16/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "34289b46c01b62b18f89cec26d9d2b5c2d304e45af2c314d59f1e1dc0752832a", }, versions = [RUST_VERSION], ) From c04c3314815216c373bc6d7440abfbe6f6bd0cb2 Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Mon, 16 Nov 2026 12:30:54 +0100 Subject: [PATCH 3/4] Apply Clippy and formatting fixes to Rust code Fix diagnostics introduced by Rust 1.100.0 Clippy and rustfmt. Leave pre-existing lint and formatting findings unchanged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7f912f98-5361-47d2-b1f3-46af0843e5e0 --- cpp/extractor/bmn/src/directory_tree.rs | 3 +-- cpp/extractor/bmn/src/include_finder.rs | 3 +-- ruby/extractor/src/extractor.rs | 14 +++++++------- rust/extractor/src/translate/base.rs | 4 ++-- shared/tree-sitter-extractor/src/diagnostics.rs | 4 ++-- shared/yeast/src/lib.rs | 5 ++--- unified/extractor/src/languages/swift/adapter.rs | 14 ++++++-------- unified/extractor/src/languages/swift/swift.rs | 4 ++-- unified/extractor/tests/corpus_tests.rs | 2 +- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/cpp/extractor/bmn/src/directory_tree.rs b/cpp/extractor/bmn/src/directory_tree.rs index 4424e3b7fcef..cb75ec69e916 100644 --- a/cpp/extractor/bmn/src/directory_tree.rs +++ b/cpp/extractor/bmn/src/directory_tree.rs @@ -87,13 +87,12 @@ impl DirectoryTree { /// suffix `sub/foo.h` results in `/a` and `/b`. pub fn directories_with_path(&self, file_suffix: &Path) -> HashSet { self.files_with_same_name(file_suffix) - .map(|files_with_name| { + .map_or_default(|files_with_name| { files_with_name .iter() .filter_map(|p| strip_suffix(p, file_suffix)) .collect() }) - .unwrap_or_default() } /// Returns an iterator over all files in the directory tree. diff --git a/cpp/extractor/bmn/src/include_finder.rs b/cpp/extractor/bmn/src/include_finder.rs index 5006c411ba63..0e9a3fdc2a50 100644 --- a/cpp/extractor/bmn/src/include_finder.rs +++ b/cpp/extractor/bmn/src/include_finder.rs @@ -656,7 +656,6 @@ mod tests { result.include_directories, vec![path.clone(), path.join("dir2")] ); - assert!(!result.unresolvable.is_empty()); assert_eq!( result.unresolvable, vec![ @@ -817,7 +816,7 @@ mod tests { // This is empty since `foo.h` is in `system_files` and hence satisfied by // `compiler_defaults`. - assert!(result.include_directories.is_empty()); + assert_eq!(result.include_directories, Vec::::new()); } #[test] diff --git a/ruby/extractor/src/extractor.rs b/ruby/extractor/src/extractor.rs index e5bac064366b..7956b97d3b6f 100644 --- a/ruby/extractor/src/extractor.rs +++ b/ruby/extractor/src/extractor.rs @@ -340,13 +340,13 @@ fn skip_space(content: &[u8], index: usize) -> usize { } /** -* If the relevant environment variable has been set by the CLI, indicating that we are extracting -* an overlay, this function reads the JSON file at the path given by its value, and returns a set -* of canonicalized paths of source files that have changed and should therefore be extracted. -* -* If the environment variable is not set (i.e. we're not extracting an overlay), or if the file -* cannot be read, this function returns `None`. In that case, all files should be extracted. -*/ + * If the relevant environment variable has been set by the CLI, indicating that we are extracting + * an overlay, this function reads the JSON file at the path given by its value, and returns a set + * of canonicalized paths of source files that have changed and should therefore be extracted. + * + * If the environment variable is not set (i.e. we're not extracting an overlay), or if the file + * cannot be read, this function returns `None`. In that case, all files should be extracted. + */ fn get_overlay_changed_files() -> Option> { let path = std::env::var("CODEQL_EXTRACTOR_RUBY_OVERLAY_CHANGES").ok()?; let file_content = fs::read_to_string(path).ok()?; diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs index 8c7ea0eb671d..f8fcb97785af 100644 --- a/rust/extractor/src/translate/base.rs +++ b/rust/extractor/src/translate/base.rs @@ -452,7 +452,7 @@ impl<'db> Translator<'db> { self.emit_parse_error(mcall, &SyntaxError::new( format!( "macro expansion failed: the macro '{}' expands to {:?} but a {:?} was expected", - mcall.path().map(|p| p.to_string()).unwrap_or_default(), + mcall.path().map_or_default(|p| p.to_string()), kind, expand_to ), range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))), @@ -466,7 +466,7 @@ impl<'db> Translator<'db> { &SyntaxError::new( format!( "macro expansion failed for '{}'", - mcall.path().map(|p| p.to_string()).unwrap_or_default() + mcall.path().map_or_default(|p| p.to_string()) ), range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))), ), diff --git a/shared/tree-sitter-extractor/src/diagnostics.rs b/shared/tree-sitter-extractor/src/diagnostics.rs index f83cc6d26677..9cfa0cd391e6 100644 --- a/shared/tree-sitter-extractor/src/diagnostics.rs +++ b/shared/tree-sitter-extractor/src/diagnostics.rs @@ -139,8 +139,8 @@ impl LogWriter { Ok(file) => self.inner = Some(std::io::BufWriter::new(file)), } } - if let Some(mut writer) = self.inner.as_mut() { - serde_json::to_writer(&mut writer, mesg) + if let Some(writer) = self.inner.as_mut() { + serde_json::to_writer(&mut *writer, mesg) .unwrap_or_else(|e| tracing::debug!("Failed to write log entry: {}", e)); writer .write_all(b"\n") diff --git a/shared/yeast/src/lib.rs b/shared/yeast/src/lib.rs index 9e59f4b2b473..41d42abff2d3 100644 --- a/shared/yeast/src/lib.rs +++ b/shared/yeast/src/lib.rs @@ -1184,10 +1184,9 @@ impl TranslatorHandle<'_, C> { ) -> TranslatedCaptures { captures.translate_except(skip, |id| { if id == self.matched_root { - translation_failure("cannot eagerly translate a capture of the matched rule root") - } else { - self.translate(ast, output, user_ctx, id) + translation_failure("cannot eagerly translate a capture of the matched rule root"); } + self.translate(ast, output, user_ctx, id) }) } } diff --git a/unified/extractor/src/languages/swift/adapter.rs b/unified/extractor/src/languages/swift/adapter.rs index d470484810f3..0d2092566265 100644 --- a/unified/extractor/src/languages/swift/adapter.rs +++ b/unified/extractor/src/languages/swift/adapter.rs @@ -193,14 +193,12 @@ fn classify(node: &Value) -> Result { /// Iterate over a node object's structural (field, value) pairs in a stable /// order, skipping metadata keys. fn field_entries(node: &Value) -> Vec<(&str, &Value)> { - node.as_object() - .map(|map| { - map.iter() - .filter(|(k, _)| !is_metadata_key(k)) - .map(|(k, v)| (k.as_str(), v)) - .collect() - }) - .unwrap_or_default() + node.as_object().map_or_default(|map| { + map.iter() + .filter(|(k, _)| !is_metadata_key(k)) + .map(|(k, v)| (k.as_str(), v)) + .collect() + }) } /// The child node objects held by a field value. diff --git a/unified/extractor/src/languages/swift/swift.rs b/unified/extractor/src/languages/swift/swift.rs index 7c99e88d44c5..9c08719f5ae7 100644 --- a/unified/extractor/src/languages/swift/swift.rs +++ b/unified/extractor/src/languages/swift/swift.rs @@ -1157,7 +1157,7 @@ fn translation_rules() -> Vec> { expression: @e) => expr { - let op = format!("try{}", m.map(|m| ctx.source_text(m)).unwrap_or_default()); + let op = format!("try{}", m.map_or_default(|m| ctx.source_text(m))); let operator = tree!((prefix_operator #{op} location: {keyword} location: {m})); @@ -1198,7 +1198,7 @@ fn translation_rules() -> Vec> { rule!((catchClause body: @body) => (catch_clause body: {body})), // As expression (type cast) — as?, as! rule!((asExpr expression: @val asKeyword: @@keyword questionOrExclamationMark: _? @@mark type: @ty) => type_cast_expr { - let op = format!("as{}", mark.map(|m| ctx.source_text(m)).unwrap_or_default()); + let op = format!("as{}", mark.map_or_default(|m| ctx.source_text(m))); let operator = tree!((infix_operator #{op} location: {keyword} location: {mark})); diff --git a/unified/extractor/tests/corpus_tests.rs b/unified/extractor/tests/corpus_tests.rs index 00c660f677a0..e5ce3c5e3249 100644 --- a/unified/extractor/tests/corpus_tests.rs +++ b/unified/extractor/tests/corpus_tests.rs @@ -190,7 +190,7 @@ fn test_corpus() { )); } // Ensure the AST passes below operate on the source of truth. - let case_input = swift_input.clone(); + let case_input = swift_input; match dump_raw_parse(&lang, &case_input) { Err(e) => { From 162fd743af97fea772bb303a066ce877bab5aa4a Mon Sep 17 00:00:00 2001 From: Simon Friis Vindum Date: Mon, 16 Nov 2026 13:45:06 +0100 Subject: [PATCH 4/4] Cargo: Remove unused Rust dependencies With Rust 1.100 Cargo now includes a lint for unused dependencies: https://blog.rust-lang.org/2026/11/12/Rust-1.100.0/#reporting-unused-dependencies-in-cargo Fix all results from the lint. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7f912f98-5361-47d2-b1f3-46af0843e5e0 --- Cargo.lock | 25 ---- MODULE.bazel | 1 - .../3rdparty/rust_workspace_deps/BUILD.bazel | 12 -- .../BUILD.chalk-derive-0.104.0.bazel | 117 ------------------ .../BUILD.chalk-ir-0.104.0.bazel | 117 ------------------ .../chalk-ir-0.104.0/BUILD.bazel | 15 --- .../rust_workspace_deps/chalk-ir/BUILD.bazel | 15 --- .../3rdparty/rust_workspace_deps/crates.bzl | 24 ---- rust/extractor/Cargo.toml | 1 - shared/tree-sitter-extractor/Cargo.toml | 1 - unified/extractor/Cargo.toml | 1 - 11 files changed, 329 deletions(-) delete mode 100644 misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-derive-0.104.0.bazel delete mode 100644 misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-ir-0.104.0.bazel delete mode 100644 misc/bazel/3rdparty/rust_workspace_deps/chalk-ir-0.104.0/BUILD.bazel delete mode 100644 misc/bazel/3rdparty/rust_workspace_deps/chalk-ir/BUILD.bazel diff --git a/Cargo.lock b/Cargo.lock index 49af57f4174d..a9bd2e079eaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -375,28 +375,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "chalk-derive" -version = "0.104.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", - "synstructure", -] - -[[package]] -name = "chalk-ir" -version = "0.104.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8" -dependencies = [ - "bitflags 2.13.2", - "chalk-derive", -] - [[package]] name = "chrono" version = "0.4.45" @@ -488,7 +466,6 @@ name = "codeql-extractor" version = "0.2.0" dependencies = [ "chrono", - "encoding", "flate2", "globset", "num_cpus", @@ -546,7 +523,6 @@ version = "0.1.0" dependencies = [ "clap", "codeql-extractor", - "encoding", "rayon", "regex", "serde", @@ -566,7 +542,6 @@ name = "codeql-rust" version = "0.1.0" dependencies = [ "anyhow", - "chalk-ir", "chrono", "clap", "codeql-extractor", diff --git a/MODULE.bazel b/MODULE.bazel index 5fdb1bebe9fe..1f5d923cb5fc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -135,7 +135,6 @@ use_repo( "vendor_rs__anyhow-1.0.104", "vendor_rs__cached-0.54.0", "vendor_rs__cc-1.4.6", - "vendor_rs__chalk-ir-0.104.0", "vendor_rs__chrono-0.4.45", "vendor_rs__clap-4.6.7", "vendor_rs__dunce-1.0.5", diff --git a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel b/misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel index 20e67a6711c0..b96321c9f7b7 100644 --- a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel +++ b/misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel @@ -79,18 +79,6 @@ alias( tags = ["manual"], ) -alias( - name = "chalk-ir-0.104.0", - actual = "@vendor_rs__chalk-ir-0.104.0//:chalk_ir", - tags = ["manual"], -) - -alias( - name = "chalk-ir", - actual = "@vendor_rs__chalk-ir-0.104.0//:chalk_ir", - tags = ["manual"], -) - alias( name = "chrono-0.4.45", actual = "@vendor_rs__chrono-0.4.45//:chrono", diff --git a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-derive-0.104.0.bazel b/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-derive-0.104.0.bazel deleted file mode 100644 index 1fd8f4a3ea56..000000000000 --- a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-derive-0.104.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_rust_workspace_deps -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars") -load("@rules_rust//rust:defs.bzl", "rust_proc_macro") - -package(default_visibility = ["//visibility:public"]) - -cargo_toml_env_vars( - name = "cargo_toml_env_vars", - src = "Cargo.toml", -) - -rust_proc_macro( - name = "chalk_derive", - 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=chalk-derive", - "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-fuchsia": [], - "@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 = "0.104.0", - deps = [ - "@vendor_rs__proc-macro2-1.0.107//:proc_macro2", - "@vendor_rs__quote-1.0.47//:quote", - "@vendor_rs__syn-2.0.119//:syn", - "@vendor_rs__synstructure-0.13.2//:synstructure", - ], -) diff --git a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-ir-0.104.0.bazel b/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-ir-0.104.0.bazel deleted file mode 100644 index a999ad7d4e8a..000000000000 --- a/misc/bazel/3rdparty/rust_workspace_deps/BUILD.chalk-ir-0.104.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_rust_workspace_deps -############################################################################### - -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 = "chalk_ir", - 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", - proc_macro_deps = [ - "@vendor_rs__chalk-derive-0.104.0//:chalk_derive", - ], - rustc_env_files = [ - ":cargo_toml_env_vars", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=chalk-ir", - "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-fuchsia": [], - "@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 = "0.104.0", - deps = [ - "@vendor_rs__bitflags-2.13.2//:bitflags", - ], -) diff --git a/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir-0.104.0/BUILD.bazel b/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir-0.104.0/BUILD.bazel deleted file mode 100644 index 606f7a878acc..000000000000 --- a/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir-0.104.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_rust_workspace_deps -############################################################################### - -package(default_visibility = ["//visibility:public"]) - -alias( - name = "chalk-ir-0.104.0", - actual = "@vendor_rs__chalk-ir-0.104.0//:chalk_ir", - tags = ["manual"], -) diff --git a/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir/BUILD.bazel b/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir/BUILD.bazel deleted file mode 100644 index a6dacc9d5bf5..000000000000 --- a/misc/bazel/3rdparty/rust_workspace_deps/chalk-ir/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_rust_workspace_deps -############################################################################### - -package(default_visibility = ["//visibility:public"]) - -alias( - name = "chalk-ir", - actual = "@vendor_rs__chalk-ir-0.104.0//:chalk_ir", - tags = ["manual"], -) diff --git a/misc/bazel/3rdparty/rust_workspace_deps/crates.bzl b/misc/bazel/3rdparty/rust_workspace_deps/crates.bzl index b5e41d6139f7..052465c1affb 100644 --- a/misc/bazel/3rdparty/rust_workspace_deps/crates.bzl +++ b/misc/bazel/3rdparty/rust_workspace_deps/crates.bzl @@ -411,7 +411,6 @@ _NORMAL_DEPENDENCIES = { "rust/extractor": { _COMMON_CONDITION: { "anyhow": Label("@vendor_rs//anyhow-1.0.104"), - "chalk-ir": Label("@vendor_rs//chalk-ir-0.104.0"), "chrono": Label("@vendor_rs//chrono-0.4.45"), "clap": Label("@vendor_rs//clap-4.6.7"), "dunce": Label("@vendor_rs//dunce-1.0.5"), @@ -456,7 +455,6 @@ _NORMAL_DEPENDENCIES = { "shared/tree-sitter-extractor": { _COMMON_CONDITION: { "chrono": Label("@vendor_rs//chrono-0.4.45"), - "encoding": Label("@vendor_rs//encoding-0.2.33"), "flate2": Label("@vendor_rs//flate2-1.1.9"), "globset": Label("@vendor_rs//globset-0.4.18"), "num_cpus": Label("@vendor_rs//num_cpus-1.17.0"), @@ -498,7 +496,6 @@ _NORMAL_DEPENDENCIES = { "unified/extractor": { _COMMON_CONDITION: { "clap": Label("@vendor_rs//clap-4.6.7"), - "encoding": Label("@vendor_rs//encoding-0.2.33"), "rayon": Label("@vendor_rs//rayon-1.12.0"), "regex": Label("@vendor_rs//regex-1.13.1"), "serde": Label("@vendor_rs//serde-1.0.229"), @@ -1446,26 +1443,6 @@ def crate_repositories(): build_file = Label("//misc/bazel/3rdparty/rust_workspace_deps:BUILD.chacha20-0.10.2.bazel"), ) - maybe( - http_archive, - name = "vendor_rs__chalk-derive-0.104.0", - sha256 = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa", - type = "tar.gz", - urls = ["https://static.crates.io/crates/chalk-derive/0.104.0/download"], - strip_prefix = "chalk-derive-0.104.0", - build_file = Label("//misc/bazel/3rdparty/rust_workspace_deps:BUILD.chalk-derive-0.104.0.bazel"), - ) - - maybe( - http_archive, - name = "vendor_rs__chalk-ir-0.104.0", - sha256 = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8", - type = "tar.gz", - urls = ["https://static.crates.io/crates/chalk-ir/0.104.0/download"], - strip_prefix = "chalk-ir-0.104.0", - build_file = Label("//misc/bazel/3rdparty/rust_workspace_deps:BUILD.chalk-ir-0.104.0.bazel"), - ) - maybe( http_archive, name = "vendor_rs__chrono-0.4.45", @@ -4800,7 +4777,6 @@ def crate_repositories(): struct(repo = "vendor_rs__anyhow-1.0.104", is_dev_dep = False), struct(repo = "vendor_rs__cached-0.54.0", is_dev_dep = False), struct(repo = "vendor_rs__cc-1.4.6", is_dev_dep = False), - struct(repo = "vendor_rs__chalk-ir-0.104.0", is_dev_dep = False), struct(repo = "vendor_rs__chrono-0.4.45", is_dev_dep = False), struct(repo = "vendor_rs__clap-4.6.7", is_dev_dep = False), struct(repo = "vendor_rs__dunce-1.0.5", is_dev_dep = False), diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml index 8b923b1ccbad..15ac0510f844 100644 --- a/rust/extractor/Cargo.toml +++ b/rust/extractor/Cargo.toml @@ -44,5 +44,4 @@ toml = "1.1.8" tracing = "0.1.44" tracing-flame = "0.2.0" tracing-subscriber = "0.3.23" -chalk-ir = "0.104.0" mustache = "0.9.0" diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml index 11ecf7a0e9e9..582b284a1da8 100644 --- a/shared/tree-sitter-extractor/Cargo.toml +++ b/shared/tree-sitter-extractor/Cargo.toml @@ -16,7 +16,6 @@ tracing = "0.1" tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } rayon = "1.12.0" regex = "1.13.1" -encoding = "0.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" chrono = { version = "0.4.45", features = ["serde"] } diff --git a/unified/extractor/Cargo.toml b/unified/extractor/Cargo.toml index 22dac2a84223..1e980161538f 100644 --- a/unified/extractor/Cargo.toml +++ b/unified/extractor/Cargo.toml @@ -15,7 +15,6 @@ tracing = "0.1" tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } rayon = "1.12.0" regex = "1.13.1" -encoding = "0.2" serde = "1.0.229" serde_json = { version = "1.0.154", features = ["unbounded_depth"] }