Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/incremental/ich_nested_items.rs b/src/test/incremental/ich_nested_items.rs
deleted file mode 100644
index 379c09575..000000000
--- a/src/test/incremental/ich_nested_items.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Check that the hash of `foo` doesn't change just because we ordered
-// the nested items (or even added new ones).
-
-// revisions: cfail1 cfail2
-// build-pass (FIXME(62277): could be check-pass?)
-// compile-flags: -Z query-dep-graph
-
-#![crate_type = "rlib"]
-#![feature(rustc_attrs)]
-
-#[rustc_clean(except = "hir_owner_nodes", cfg = "cfail2")]
-pub fn foo() {
-    #[cfg(cfail1)]
-    pub fn baz() {} // order is different...
-
-    #[rustc_clean(cfg = "cfail2")]
-    pub fn bar() {} // but that doesn't matter.
-
-    #[cfg(cfail2)]
-    pub fn baz() {} // order is different...
-
-    pub fn bap() {} // neither does adding a new item
-}