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/krate-inherent.rs b/src/test/incremental/krate-inherent.rs
deleted file mode 100644
index 2c04e1105..000000000
--- a/src/test/incremental/krate-inherent.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// revisions: cfail1 cfail2
-// compile-flags: -Z query-dep-graph
-// build-pass (FIXME(62277): could be check-pass?)
-
-#![allow(warnings)]
-#![feature(rustc_attrs)]
-#![rustc_partition_reused(module = "krate_inherent-x", cfg = "cfail2")]
-#![crate_type = "rlib"]
-
-pub mod x {
-    pub struct Foo;
-    impl Foo {
-        pub fn foo(&self) {}
-    }
-
-    pub fn method() {
-        let x: Foo = Foo;
-        x.foo(); // inherent methods used to add an edge from hir_crate
-    }
-}
-
-#[cfg(cfail1)]
-pub fn bar() {} // remove this unrelated fn in cfail2, which should not affect `x::method`