user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #152188 - cuviper:placeholder-stdarch, r=Mark-Simulacrum

Browse source 
Include `library/stdarch` for `CURRENT_RUSTC_VERSION` updates

Our tool `replace-version-placeholder` uses the `tidy` file walker and its
directory filter, but that skips `library/stdarch` which we do need for public
stability markers. This PR adds a local filter function that explicitly allows
that path.

The commit for 1.94 `stdarch` updates is coming from beta rust-lang/rust#152187.
This commit is contained in:
Jacob Pratt 2026-02-14 23:17:40 -05:00 • committed by GitHub
commit ef776c603c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 1228 additions and 1222 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/clippy/clippy_lints/src/deprecated_lints.rs
View file

@ -123,7 +123,7 @@ declare_with_version! { RENAMED(RENAMED_VERSION) = [
("clippy::into_iter_on_array", "array_into_iter"),
#[clippy::version = ""]
("clippy::invalid_atomic_ordering", "invalid_atomic_ordering"),
#[clippy::version = "CURRENT_RUSTC_VERSION"]
#[clippy::version = "1.88.0"]
("clippy::invalid_null_ptr_usage", "invalid_null_arguments"),
#[clippy::version = ""]
("clippy::invalid_ref", "invalid_value"),

8
src/tools/replace-version-placeholder/src/main.rs
View file

@ -16,7 +16,7 @@ fn main() {
&root_path.join("src/doc/rustc"),
&root_path.join("src/doc/rustdoc"),
],
|path, _is_dir| walk::filter_dirs(path),
|path, _is_dir| filter_dirs(path),
&mut |entry, contents| {
if !contents.contains(VERSION_PLACEHOLDER) {
return;
@ -27,3 +27,9 @@ fn main() {
},
);
}
fn filter_dirs(path: &std::path::Path) -> bool {
// tidy would skip some paths that we do want to process
let allow = ["library/stdarch"];
walk::filter_dirs(path) && !allow.iter().any(|p| path.ends_with(p))
}