Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 44 deletions

diff --git a/src/test/incremental/issue-42602.rs b/src/test/incremental/issue-42602.rs
deleted file mode 100644
index b8d5303fb..000000000
--- a/src/test/incremental/issue-42602.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Regression test for #42602. It used to be that we had
-// a dep-graph like
-//
-//     typeck(foo) -> FnOnce -> typeck(bar)
-//
-// This was fixed by improving the resolution of the `FnOnce` trait
-// selection node.
-
-// revisions:cfail1 cfail2 cfail3
-// compile-flags:-Zquery-dep-graph
-// build-pass (FIXME(62277): could be check-pass?)
-
-#![feature(rustc_attrs)]
-
-fn main() {
-    a::foo();
-    b::bar();
-}
-
-mod a {
-    #[cfg(cfail1)]
-    pub fn foo() {
-        let x = vec![1, 2, 3];
-        let v = || ::std::mem::drop(x);
-        v();
-    }
-
-    #[cfg(not(cfail1))]
-    pub fn foo() {
-        let x = vec![1, 2, 3, 4];
-        let v = || ::std::mem::drop(x);
-        v();
-    }
-}
-
-mod b {
-    #[rustc_clean(cfg="cfail2")]
-    #[rustc_clean(cfg="cfail3")]
-    pub fn bar() {
-        let x = vec![1, 2, 3];
-        let v = || ::std::mem::drop(x);
-        v();
-    }
-}