Merge ref 'd493b7c5ac63' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: rust-lang/rust@d493b7c
Filtered ref: rust-lang/rustc-dev-guide@8e19834
Upstream diff: rust-lang/rust@cf1817b...d493b7c

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The rustc-josh-sync Cronjob Bot

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() {
             }
         });
     });
-}
+}

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:#?}");
     });
-}
+}

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 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