From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../ui/traits/impl-inherent-prefer-over-trait.rs   | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/test/ui/traits/impl-inherent-prefer-over-trait.rs

(limited to 'src/test/ui/traits/impl-inherent-prefer-over-trait.rs')

diff --git a/src/test/ui/traits/impl-inherent-prefer-over-trait.rs b/src/test/ui/traits/impl-inherent-prefer-over-trait.rs
new file mode 100644
index 000000000..827607888
--- /dev/null
+++ b/src/test/ui/traits/impl-inherent-prefer-over-trait.rs
@@ -0,0 +1,30 @@
+// run-pass
+
+struct Foo;
+
+trait Trait {
+    fn bar(&self);
+}
+
+// Inherent impls should be preferred over trait ones.
+impl Foo {
+    fn bar(&self) {}
+}
+
+impl dyn Trait {
+    fn baz(_: &Foo) {}
+}
+
+impl Trait for Foo {
+    fn bar(&self) { panic!("wrong method called!") }
+}
+
+fn main() {
+    Foo.bar();
+    Foo::bar(&Foo);
+    <Foo>::bar(&Foo);
+
+    // Should work even if Trait::baz doesn't exist.
+    // N.B: `<Trait>::bar` would be ambiguous.
+    <dyn Trait>::baz(&Foo);
+}
-- 
cgit v1.2.3