Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 26 additions & 22 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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],
)
Expand Down Expand Up @@ -130,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",
Expand Down
3 changes: 1 addition & 2 deletions cpp/extractor/bmn/src/directory_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PathBuf> {
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.
Expand Down
3 changes: 1 addition & 2 deletions cpp/extractor/bmn/src/include_finder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,6 @@ mod tests {
result.include_directories,
vec![path.clone(), path.join("dir2")]
);
assert!(!result.unresolvable.is_empty());

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an instance of this rule.

It might look weird to just remove the assert, but the assert_eq! right below makes it unnecessary and that one will print nicer output if it fails.

assert_eq!(
result.unresolvable,
vec![
Expand Down Expand Up @@ -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::<PathBuf>::new());

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit curious as to why this is the better way to write this assertion. I guess assert_eq perhaps gives more information in the case of a failure, but on the other hand we're creating a new empty vector only to test for equality, and we have to explicitly specify the type of its elements.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's because the error that'll get printed on assertion failure is much more informative.

}

#[test]
Expand Down
12 changes: 0 additions & 12 deletions misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading
Loading