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/feature-gates/feature-gate-overlapping_marker_traits.rs   | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs

(limited to 'src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs')

diff --git a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs
new file mode 100644
index 000000000..6922d6f83
--- /dev/null
+++ b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs
@@ -0,0 +1,9 @@
+use std::fmt::{Debug, Display};
+
+trait MyMarker {}
+
+impl<T: Display> MyMarker for T {}
+impl<T: Debug> MyMarker for T {}
+//~^ ERROR E0119
+
+fn main() {}
-- 
cgit v1.2.3