Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/ui/error-codes/E0201.stderr b/tests/ui/error-codes/E0201.stderr
new file mode 100644
index 000000000..608ff6917
--- /dev/null
+++ b/tests/ui/error-codes/E0201.stderr
@@ -0,0 +1,35 @@
+error[E0201]: duplicate definitions with name `baz`:
+  --> $DIR/E0201.rs:17:5
+   |
+LL |     fn baz(&self) -> bool;
+   |     ---------------------- item in trait
+...
+LL |     fn baz(&self) -> bool { true }
+   |     ------------------------------ previous definition here
+LL |     fn baz(&self) -> bool { self.0 > 5 }
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
+
+error[E0201]: duplicate definitions with name `Quux`:
+  --> $DIR/E0201.rs:18:5
+   |
+LL |     type Quux;
+   |     ---------- item in trait
+...
+LL |     type Quux = u32;
+   |     ---------------- previous definition here
+...
+LL |     type Quux = u32;
+   |     ^^^^^^^^^^^^^^^^ duplicate definition
+
+error[E0592]: duplicate definitions with name `bar`
+  --> $DIR/E0201.rs:5:5
+   |
+LL |     fn bar(&self) -> bool { self.0 > 5 }
+   |     --------------------- other definition for `bar`
+LL |     fn bar() {}
+   |     ^^^^^^^^ duplicate definitions for `bar`
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0201, E0592.
+For more information about an error, try `rustc --explain E0201`.