Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs b/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs
deleted file mode 100644
index b31f60e97..000000000
--- a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// revisions:rpass1 rpass2
-// compile-flags: -Z query-dep-graph
-
-// We use #[inline(always)] to ensure that the downstream crate
-// will always load the MIR for these functions
-
-#![feature(rustc_attrs)]
-
-#[allow(unused)]
-macro_rules! first_macro {
-    () => {
-        println!("New call!");
-    }
-}
-
-#[rustc_clean(except="hir_owner_nodes,typeck,optimized_mir,promoted_mir", cfg="rpass2")]
-#[inline(always)]
-pub fn changed_fn() {
-    // This will cause additional hygiene to be generate,
-    // which will cause the SyntaxContext/ExpnId raw ids to be
-    // different when we write out `my_fn` to the crate metadata.
-    #[cfg(rpass2)]
-    first_macro!();
-}
-
-macro_rules! print_loc {
-    () => {
-        println!("Caller loc: {}", std::panic::Location::caller());
-    }
-}
-
-#[rustc_clean(cfg="rpass2")]
-#[inline(always)]
-pub fn unchanged_fn() {
-    print_loc!();
-}