Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.rs b/src/test/ui/coherence/coherence-free-vs-bound-region.rs
deleted file mode 100644
index 2f5c49d29..000000000
--- a/src/test/ui/coherence/coherence-free-vs-bound-region.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Capture a coherence pattern from wasm-bindgen that we discovered as part of
-// future-compatibility warning #56105. This pattern currently receives a lint
-// warning but we probably want to support it long term.
-//
-// Key distinction: we are implementing once for `A` (take ownership) and one
-// for `&A` (borrow).
-//
-// c.f. #56105
-
-#![deny(coherence_leak_check)]
-
-trait TheTrait {}
-
-impl<'a> TheTrait for fn(&'a u8) {}
-
-impl TheTrait for fn(&u8) {
-    //~^ ERROR conflicting implementations of trait
-    //~| WARNING this was previously accepted by the compiler
-}
-
-fn main() {}