Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 55 deletions

diff --git a/src/test/incremental/source_loc_macros.rs b/src/test/incremental/source_loc_macros.rs
deleted file mode 100644
index e5f04e5dc..000000000
--- a/src/test/incremental/source_loc_macros.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// This test makes sure that different expansions of the file!(), line!(),
-// column!() macros get picked up by the incr. comp. hash.
-
-// revisions:rpass1 rpass2
-
-// compile-flags: -Z query-dep-graph
-
-#![feature(rustc_attrs)]
-
-#[rustc_clean(cfg="rpass2")]
-fn line_same() {
-    let _ = line!();
-}
-
-#[rustc_clean(cfg="rpass2")]
-fn col_same() {
-    let _ = column!();
-}
-
-#[rustc_clean(cfg="rpass2")]
-fn file_same() {
-    let _ = file!();
-}
-
-#[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="rpass2")]
-fn line_different() {
-    #[cfg(rpass1)]
-    {
-        let _ = line!();
-    }
-    #[cfg(rpass2)]
-    {
-        let _ = line!();
-    }
-}
-
-#[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="rpass2")]
-fn col_different() {
-    #[cfg(rpass1)]
-    {
-        let _ = column!();
-    }
-    #[cfg(rpass2)]
-    {
-        let _ =        column!();
-    }
-}
-
-fn main() {
-    line_same();
-    line_different();
-    col_same();
-    col_different();
-    file_same();
-}