Skip to content

Commit a01538c

Browse files
[ci] Roll pinned nightly toolchain (#2557)
gherrit-pr-id: I0da5e9161750390c5573fa4f299f50469951740b
1 parent d0c2b42 commit a01538c

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ zerocopy-panic-in-const-and-vec-try-reserve-1-57-0 = "1.57.0"
6060
[package.metadata.ci]
6161
# The versions of the stable and nightly compiler toolchains to use in CI.
6262
pinned-stable = "1.87.0"
63-
pinned-nightly = "nightly-2025-05-28"
63+
pinned-nightly = "nightly-2025-05-29"
6464

6565
[package.metadata.docs.rs]
6666
all-features = true

build.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,19 @@ fn main() {
7070
let rustc_version = rustc_version();
7171

7272
if rustc_version >= (Version { major: 1, minor: 77, patch: 0 }) {
73-
// This tells the `unexpected_cfgs` lint to expect to see all of these
74-
// `cfg`s. The `cargo::` syntax was only added in 1.77, so we don't emit
75-
// these on earlier toolchain versions.
7673
for version_cfg in &version_cfgs {
74+
// This tells the `unexpected_cfgs` lint to expect to see all of
75+
// these `cfg`s. The `cargo::` syntax was only added in 1.77, so we
76+
// don't emit these on earlier toolchain versions.
7777
println!("cargo:rustc-check-cfg=cfg({})", version_cfg.cfg_name);
78+
79+
// This tells the `unexpected_cfgs` lint to expect to see `cfg`s of
80+
// the form `rust = "1.2.3"`. These aren't real `cfg`s, but we use
81+
// them in `cfg_attr(doc_cfg, doc(cfg(rust = "1.2.3")))` on items
82+
// that are version-gated so that the rendered Rustdoc shows which
83+
// Rust toolchain versions those items are available on.
84+
let Version { major, minor, patch } = version_cfg.version;
85+
println!("cargo:rustc-check-cfg=cfg(rust, values(\"{}.{}.{}\"))", major, minor, patch);
7886
}
7987
// FIXME(https://github.com/rust-lang/rust/issues/124816): Remove these
8088
// once they're no longer needed.

testutil/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ cargo_metadata = "0.18.0"
1616
# Pin to 0.1.5 because more recent versions require a Rust version more recent
1717
# than our MSRV.
1818
cargo-platform = "=0.1.5"
19+
# Pin to 0.4.11 because more recent versions require a Rust version more recent
20+
# than our MSRV.
21+
lock_api = "=0.4.11"
1922
# Pin to 2.5.0 because more recent versions require a Rust version more recent
2023
# than our MSRV.
2124
memchr = "=2.5.0"
2225
parking_lot = "=0.12.1"
26+
# Pin to 0.9.10 because more recent versions require a Rust version more recent
27+
# than our MSRV.
28+
parking_lot_core = "=0.9.10"
2329
rustc_version = "0.4.0"
2430
# Pin to 0.3.0 because more recent versions require a Rust version more recent
2531
# than our MSRV.

0 commit comments

Comments
 (0)