From 6f649514838bf666c1acc0d5dcbed9fcec3f10ba Mon Sep 17 00:00:00 2001 From: Zalathar Date: Tue, 21 Apr 2026 22:30:43 +1000 Subject: [PATCH 1/4] Make `//@ skip-filecheck` a normal compiletest directive --- src/tests/directives.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tests/directives.md b/src/tests/directives.md index 76bf2cdbe..506deb194 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -326,6 +326,8 @@ See [Pretty-printer](compiletest.md#pretty-printer-tests). The following directives affect how certain command-line tools are invoked, in test suites that use those tools: +- `skip-filecheck` avoids running LLVM's `FileCheck` tool in tests that would normally run it to check output. + - Used by mir-opt tests. - `filecheck-flags` adds extra flags when running LLVM's `FileCheck` tool. - Used by [codegen tests](compiletest.md#codegen-tests), [assembly tests](compiletest.md#assembly-tests), and From d5f2e983dceb891e8bef723905faaf7a7019f947 Mon Sep 17 00:00:00 2001 From: Zalathar Date: Tue, 21 Apr 2026 22:40:00 +1000 Subject: [PATCH 2/4] Support `//@ skip-filecheck` in codegen and assembly tests Skipping FileCheck in codegen/assembly tests is normally not very useful, but a small number of existing tests were using `//@ build-pass` to do so anyway, so it's clearer for them to explicitly use `//@ skip-filecheck` instead. --- src/tests/directives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/directives.md b/src/tests/directives.md index 506deb194..d536d324c 100644 --- a/src/tests/directives.md +++ b/src/tests/directives.md @@ -327,7 +327,7 @@ The following directives affect how certain command-line tools are invoked, in test suites that use those tools: - `skip-filecheck` avoids running LLVM's `FileCheck` tool in tests that would normally run it to check output. - - Used by mir-opt tests. + - Used by codegen tests, assembly tests, and mir-opt tests. - `filecheck-flags` adds extra flags when running LLVM's `FileCheck` tool. - Used by [codegen tests](compiletest.md#codegen-tests), [assembly tests](compiletest.md#assembly-tests), and From ddc273324db7cb691016aced425a4bee4207f13c Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Thu, 23 Apr 2026 14:28:43 +1000 Subject: [PATCH 3/4] Simplify `Config::track_state`. This is a callback used to track otherwise untracked state. It was added in #116731 for Clippy. (It was originally named `hash_untracked_state`, and examples in the rustc-dev-guide still use that name.) The `StableHasher` argument is unused, and probably has never been used. There is a FIXME comment pointing this out, which was added more than a year ago. This commit removes the `StableHasher` callback argument. This also removes the need for `Options::untracked_state_hash`. --- examples/rustc-interface-example.rs | 4 ++-- examples/rustc-interface-getting-diagnostics.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/rustc-interface-example.rs b/examples/rustc-interface-example.rs index b44395046..4601d9adb 100644 --- a/examples/rustc-interface-example.rs +++ b/examples/rustc-interface-example.rs @@ -50,7 +50,7 @@ fn main() { make_codegen_backend: None, expanded_args: Vec::new(), ice_file: None, - hash_untracked_state: None, + track_state: None, using_internal_features: &rustc_driver::USING_INTERNAL_FEATURES, }; rustc_interface::run_compiler(config, |compiler| { @@ -72,4 +72,4 @@ fn main() { } }); }); -} \ No newline at end of file +} diff --git a/examples/rustc-interface-getting-diagnostics.rs b/examples/rustc-interface-getting-diagnostics.rs index 342316ba6..ea2a77270 100644 --- a/examples/rustc-interface-getting-diagnostics.rs +++ b/examples/rustc-interface-getting-diagnostics.rs @@ -78,7 +78,7 @@ fn main() { make_codegen_backend: None, expanded_args: Vec::new(), ice_file: None, - hash_untracked_state: None, + track_state: None, using_internal_features: &rustc_driver::USING_INTERNAL_FEATURES, }; rustc_interface::run_compiler(config, |compiler| { @@ -97,4 +97,4 @@ fn main() { buffer.lock().unwrap().iter().for_each(|diagnostic| { println!("{diagnostic:#?}"); }); -} \ No newline at end of file +} From 08fc2df0b13eec2382a6b3f6db4cfd4a9aa34424 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Fri, 24 Apr 2026 07:52:36 +0000 Subject: [PATCH 4/4] Prepare for merging from rust-lang/rust This updates the rust-version file to d493b7c5ac637ed7edf626128b9f14796a2dad20. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 1175e3372..702f1a796 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -cf1817bc6ecd2d14ca492247c804bad31948dd56 +d493b7c5ac637ed7edf626128b9f14796a2dad20