Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 18 deletions

diff --git a/src/test/ui/issues/issue-22684.rs b/src/test/ui/issues/issue-22684.rs
deleted file mode 100644
index a5b042706..000000000
--- a/src/test/ui/issues/issue-22684.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-mod foo {
-    pub struct Foo;
-    impl Foo {
-        fn bar(&self) {}
-    }
-
-    pub trait Baz {
-        fn bar(&self) -> bool { true }
-    }
-    impl Baz for Foo {}
-}
-
-fn main() {
-    use foo::Baz;
-
-    // Check that `bar` resolves to the trait method, not the inherent impl method.
-    let _: () = foo::Foo.bar(); //~ ERROR mismatched types
-}