Skip to content

Commit 116f5a2

Browse files
redsun82redsun82
committed
Bazel: Update Rust toolchain to nightly/2026-01-22 and rules_rust to 0.68.1.codeql.1
Update the Rust nightly toolchain from nightly/2025-08-01 to nightly/2026-01-22 (rustc 1.95.0-nightly), and rules_rust from 0.66.0 to 0.68.1.codeql.1. The new nightly changed how stdlib metadata is distributed: .rlib files now contain only a metadata stub, with full metadata in separate .rmeta files. rules_rust's stdlib glob doesn't include *.rmeta, causing 'only metadata stub found' errors. This is patched via a custom registry entry (0.68.1.codeql.1). Upstream bug: bazelbuild/rules_rust#3859
1 parent 22b55f3 commit 116f5a2

File tree

7 files changed

+207
-24
lines changed

7 files changed

+207
-24
lines changed

‎MODULE.bazel‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bazel_dep(name = "rules_kotlin", version = "2.2.0-codeql.1")
2828
bazel_dep(name = "gazelle", version = "0.40.0")
2929
bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
31-
bazel_dep(name = "rules_rust", version = "0.66.0")
31+
bazel_dep(name = "rules_rust", version = "0.68.1.codeql.1")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
3333

3434
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -41,7 +41,7 @@ RUST_EDITION = "2024"
4141
# a nightly toolchain is required to enable experimental_use_cc_common_link, which we require internally
4242
# we prefer to run the same version as internally, even if experimental_use_cc_common_link is not really
4343
# required in this repo
44-
RUST_VERSION = "nightly/2025-08-01"
44+
RUST_VERSION = "nightly/2026-01-22"
4545

4646
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
4747
rust.toolchain(
@@ -53,26 +53,26 @@ rust.toolchain(
5353
],
5454
# generated by buildutils-internal/scripts/fill-rust-sha256s.py (internal repo)
5555
sha256s = {
56-
"2025-08-01/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "9bbeaf5d3fc7247d31463a9083aa251c995cc50662c8219e7a2254d76a72a9a4",
57-
"2025-08-01/rustc-nightly-x86_64-apple-darwin.tar.xz": "c9ea539a8eff0d5d162701f99f9e1aabe14dd0dfb420d62362817a5d09219de7",
58-
"2025-08-01/rustc-nightly-aarch64-apple-darwin.tar.xz": "ae83feebbc39cfd982e4ecc8297731fe79c185173aee138467b334c5404b3773",
59-
"2025-08-01/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "9f170c30d802a349be60cf52ec46260802093cb1013ad667fc0d528b7b10152f",
60-
"2025-08-01/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "9ae5f3cd8f557c4f6df522597c69d14398cf604cfaed2b83e767c4b77a7eaaf6",
61-
"2025-08-01/clippy-nightly-x86_64-apple-darwin.tar.xz": "983cb9ee0b6b968188e04ab2d33743d54764b2681ce565e1b3f2b9135c696a3e",
62-
"2025-08-01/clippy-nightly-aarch64-apple-darwin.tar.xz": "ed2219dbc49d088225e1b7c5c4390fa295066e071fddaa2714018f6bb39ddbf0",
63-
"2025-08-01/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "911f40ab5cbdd686f40e00965271fe47c4805513a308ed01f30eafb25b448a50",
64-
"2025-08-01/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "106463c284e48e4904c717471eeec2be5cc83a9d2cae8d6e948b52438cad2e69",
65-
"2025-08-01/cargo-nightly-x86_64-apple-darwin.tar.xz": "6ad35c40efc41a8c531ea43235058347b6902d98a9693bf0aed7fc16d5590cef",
66-
"2025-08-01/cargo-nightly-aarch64-apple-darwin.tar.xz": "dd28c365e9d298abc3154c797720ad36a0058f131265c9978b4c8e4e37012c8a",
67-
"2025-08-01/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "7b431286e12d6b3834b038f078389a00cac73f351e8c3152b2504a3c06420b3b",
68-
"2025-08-01/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "e342e305d7927cc288d386983b2bc253cfad3776b113386e903d0b302648ef47",
69-
"2025-08-01/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "e44dd3506524d85c37b3a54bcc91d01378fd2c590b2db5c5974d12f05c1b84d1",
70-
"2025-08-01/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "0c1b5f46dd81be4a9227b10283a0fcaa39c14fea7e81aea6fd6d9887ff6cdc41",
71-
"2025-08-01/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "423e5fd11406adccbc31b8456ceb7375ce055cdf45e90d2c3babeb2d7f58383f",
72-
"2025-08-01/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "3c0ceb46a252647a1d4c7116d9ccae684fa5e42aaf3296419febd2c962c3b41d",
73-
"2025-08-01/rust-std-nightly-x86_64-apple-darwin.tar.xz": "3be416003cab10f767390a753d1d16ae4d26c7421c03c98992cf1943e5b0efe8",
74-
"2025-08-01/rust-std-nightly-aarch64-apple-darwin.tar.xz": "4046ac0ef951cb056b5028a399124f60999fa37792eab69d008d8d7965f389b4",
75-
"2025-08-01/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "191ed9d8603c3a4fe5a7bbbc2feb72049078dae2df3d3b7d5dedf3abbf823e6e",
56+
"2026-01-22/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "88db619323cc1321630d124efa51ed02fabc5e020f08cfa0eda2c0ac1afbe69a",
57+
"2026-01-22/rustc-nightly-x86_64-apple-darwin.tar.xz": "08484da3fa38db56f93629aeabdc0ae9ff8ed9704c0792d35259cbc849b3f54c",
58+
"2026-01-22/rustc-nightly-aarch64-apple-darwin.tar.xz": "a39c0b21b7058e364ea1bd43144e42e4bf1efade036b2e82455f2afce194ee81",
59+
"2026-01-22/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "d00248ee9850dbb6932b2578e32ff74fc7c429854c1aa071066ca31b65385a3b",
60+
"2026-01-22/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "70656a0ce994ffff16d5a35a7b170a0acd41e9bb54a589c96ed45bf97b094a4d",
61+
"2026-01-22/clippy-nightly-x86_64-apple-darwin.tar.xz": "fe242519fa961522734733009705aec3c2d9a20cc57291f2aa614e5e6262c88f",
62+
"2026-01-22/clippy-nightly-aarch64-apple-darwin.tar.xz": "38bb226363ec97c9722edf966cd58774a683e19fd2ff2a6030094445d51e06f9",
63+
"2026-01-22/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "6da9b4470beea67abfebf046f141eee0d2a8db7c7a9e4e2294478734fd477228",
64+
"2026-01-22/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "99004e9d10c43a01499642f53bb3184d41137a95d65bfb217098840a9e79e892",
65+
"2026-01-22/cargo-nightly-x86_64-apple-darwin.tar.xz": "6e021394cf8d8400ac6cfdfcef24e4d74f988e91eb8028b36de3a64ce3502990",
66+
"2026-01-22/cargo-nightly-aarch64-apple-darwin.tar.xz": "4b2494cb69ab64132cddbc411a38ea9f1105e54d6f986e43168d54f79510c673",
67+
"2026-01-22/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "c36613cf57407212d10d37b76e49a60ff42336e953cdff9e177283f530a83fc1",
68+
"2026-01-22/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "0b123c5027dbd833aae6845ffe9bd07d309bf798746a7176aadaea68fbcbd05d",
69+
"2026-01-22/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "a47864491ad5619158c950ab7570fb6e487d5117338585c27334d45824b406d8",
70+
"2026-01-22/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "db9bc826d6e2e7e914505d50157682e516ceb90357e83d77abddc32c2d962f41",
71+
"2026-01-22/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "ffaa406932b2fe62e01dad61cf4ed34860a5d2a6f9306ca340d79e630d930039",
72+
"2026-01-22/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "e9c0d5e06e18a4b509391b3088f29293e310cdc8ccc865be8fa3f09733326925",
73+
"2026-01-22/rust-std-nightly-x86_64-apple-darwin.tar.xz": "25d75995cee679a4828ca9fe48c5a31a67c3b0846018440ef912e5a6208f53f6",
74+
"2026-01-22/rust-std-nightly-aarch64-apple-darwin.tar.xz": "e4132bf3f2eed4684c86756a02315bcf481c23e675e3e25630fc604c9cb4594c",
75+
"2026-01-22/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "961bb535ef95ae8a5fa4e224cb94aff190f155c45a9bcf7a53e184b024aa41b1",
7676
},
7777
versions = [RUST_VERSION],
7878
)

‎misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
"""bazelbuild/rules_rust"""
2+
3+
module(
4+
name = "rules_rust",
5+
version = "0.68.1.codeql.1",
6+
)
7+
8+
###############################################################################
9+
## Core
10+
###############################################################################
11+
12+
bazel_dep(name = "bazel_features", version = "1.32.0")
13+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
14+
bazel_dep(name = "platforms", version = "1.0.0")
15+
bazel_dep(name = "rules_cc", version = "0.2.4")
16+
bazel_dep(name = "rules_license", version = "1.0.0")
17+
bazel_dep(name = "rules_shell", version = "0.6.1")
18+
bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
19+
20+
internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
21+
use_repo(
22+
internal_deps,
23+
"rrra",
24+
"rrra__anyhow-1.0.71",
25+
"rrra__camino-1.1.9",
26+
"rrra__clap-4.3.11",
27+
"rrra__env_logger-0.10.0",
28+
"rrra__itertools-0.11.0",
29+
"rrra__log-0.4.19",
30+
"rrra__serde-1.0.171",
31+
"rrra__serde_json-1.0.102",
32+
"rules_rust_tinyjson",
33+
)
34+
35+
cargo_internal_deps = use_extension("//cargo/private:internal_extensions.bzl", "i")
36+
use_repo(
37+
cargo_internal_deps,
38+
"rrc",
39+
"rrc__cargo-util-schemas-0.3.1",
40+
"rrc__cargo_toml-0.20.5",
41+
"rrc__pathdiff-0.1.0",
42+
"rrc__semver-1.0.25",
43+
"rrc__toml-0.8.20",
44+
)
45+
46+
rust = use_extension("//rust:extensions.bzl", "rust")
47+
rust.toolchain(edition = "2021")
48+
use_repo(rust, "rust_toolchains")
49+
50+
register_toolchains(
51+
"@rust_toolchains//:all",
52+
)
53+
54+
rust_host_tools = use_extension("//rust:extensions.bzl", "rust_host_tools")
55+
rust_host_tools.host_tools(
56+
name = "rust_host_tools",
57+
)
58+
use_repo(
59+
rust_host_tools,
60+
"rust_host_tools",
61+
)
62+
63+
rust_test = use_extension("//test:test_extensions.bzl", "rust_test", dev_dependency = True)
64+
use_repo(
65+
rust_test,
66+
"buildkite_config",
67+
"generated_inputs_in_external_repo",
68+
"libc",
69+
"rtra",
70+
"rtra__serde-1.0.228",
71+
"rtra__serde_json-1.0.145",
72+
"rtvsc",
73+
"rtvsc__serde-1.0.228",
74+
"rtvsc__serde_json-1.0.145",
75+
"rules_rust_test_load_arbitrary_tool",
76+
"rules_rust_toolchain_test_target_json",
77+
)
78+
79+
bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)
80+
bazel_dep(name = "rules_testing", version = "0.7.0", dev_dependency = True)
81+
bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
82+
83+
###############################################################################
84+
## Crate Universe
85+
###############################################################################
86+
87+
crate_universe_internal_deps = use_extension(
88+
"//crate_universe/private:internal_extensions.bzl",
89+
"cu",
90+
)
91+
use_repo(
92+
crate_universe_internal_deps,
93+
"cargo_bazel.buildifier-darwin-amd64",
94+
"cargo_bazel.buildifier-darwin-arm64",
95+
"cargo_bazel.buildifier-linux-amd64",
96+
"cargo_bazel.buildifier-linux-arm64",
97+
"cargo_bazel.buildifier-windows-amd64.exe",
98+
"cui",
99+
"cui__anyhow-1.0.98",
100+
"cui__camino-1.1.9",
101+
"cui__cargo-lock-10.1.0",
102+
"cui__cargo-platform-0.1.9",
103+
"cui__cargo_metadata-0.19.2",
104+
"cui__cargo_toml-0.22.1",
105+
"cui__cfg-expr-0.18.0",
106+
"cui__clap-4.5.37",
107+
"cui__crates-index-3.7.0",
108+
"cui__glob-0.3.2",
109+
"cui__hex-0.4.3",
110+
"cui__indoc-2.0.6",
111+
"cui__itertools-0.14.0",
112+
"cui__maplit-1.0.2",
113+
"cui__normpath-1.3.0",
114+
"cui__once_cell-1.21.3",
115+
"cui__pathdiff-0.2.3",
116+
"cui__regex-1.11.1",
117+
"cui__semver-1.0.26",
118+
"cui__serde-1.0.219",
119+
"cui__serde_json-1.0.140",
120+
"cui__serde_starlark-0.1.17",
121+
"cui__sha2-0.10.8",
122+
"cui__spdx-0.10.8",
123+
"cui__tempfile-3.19.1",
124+
"cui__tera-1.20.0",
125+
"cui__textwrap-0.16.2",
126+
"cui__toml-0.8.21",
127+
"cui__tracing-0.1.41",
128+
"cui__tracing-subscriber-0.3.19",
129+
"cui__url-2.5.4",
130+
"cui__walkdir-2.5.0",
131+
)
132+
133+
crate_universe_internal_non_repro_deps = use_extension(
134+
"//crate_universe/private:internal_extensions.bzl",
135+
"cu_nr",
136+
)
137+
use_repo(
138+
crate_universe_internal_non_repro_deps,
139+
"cargo_bazel_bootstrap",
140+
)
141+
142+
crate_universe_internal_dev_deps = use_extension(
143+
"//crate_universe/private:internal_extensions.bzl",
144+
"cu_dev",
145+
dev_dependency = True,
146+
)
147+
use_repo(
148+
crate_universe_internal_dev_deps,
149+
"cross_rs",
150+
"cross_rs_host_bin",
151+
)

‎misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/rust/private/repository_utils.bzl b/rust/private/repository_utils.bzl
2+
index 05b741947..f88074af6 100644
3+
--- a/rust/private/repository_utils.bzl
4+
+++ b/rust/private/repository_utils.bzl
5+
@@ -280,6 +280,7 @@ rust_stdlib_filegroup(
6+
srcs = glob(
7+
[
8+
"lib/rustlib/{target_triple}/lib/*.rlib",
9+
+ "lib/rustlib/{target_triple}/lib/*.rmeta",
10+
"lib/rustlib/{target_triple}/lib/*{dylib_ext}*",
11+
"lib/rustlib/{target_triple}/lib/*{staticlib_ext}",
12+
"lib/rustlib/{target_triple}/lib/self-contained/**",

‎misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-yKqAbPYGZnmsI0YyQe6ArWkiZdrQRl9RERy74wuJA1I=",
3+
"strip_prefix": "",
4+
"url": "https://github.com/bazelbuild/rules_rust/releases/download/0.68.1/rules_rust-0.68.1.tar.gz",
5+
"patches": {
6+
"include_rmeta_in_stdlib.patch": "sha256-7n8XHpfkLUMEbRG6lKqdhLWydsWlRRG+Ywkxk6LvY9c="
7+
},
8+
"patch_strip": 1
9+
}

‎misc/bazel/registry/modules/rules_rust/metadata.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"homepage": "https://github.com/bazelbuild/rules_rust",
3+
"maintainers": [],
4+
"repository": [
5+
"github:bazelbuild/rules_rust"
6+
],
7+
"versions": [
8+
"0.68.1.codeql.1"
9+
],
10+
"yanked_versions": {}
11+
}

‎rust/extractor/src/nightly-toolchain/rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-06-01"
2+
channel = "nightly-2026-01-22"
33
components = [ "rust-src" ]

‎rust/ql/test/rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# IMPORTANT: this can also have an impact on QL test results
33

44
[toolchain]
5-
channel = "1.90"
5+
channel = "1.93"
66
profile = "minimal"
77
components = [ "rust-src" ]

0 commit comments

Comments
 (0)