Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 19 deletions

diff --git a/src/test/ui/traits/map-types.rs b/src/test/ui/traits/map-types.rs
deleted file mode 100644
index dc33b9618..000000000
--- a/src/test/ui/traits/map-types.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::collections::HashMap;
-
-
-
-trait Map<K, V>
-{
-    fn get(&self, k: K) -> V { panic!() }
-}
-
-impl<K, V> Map<K, V> for HashMap<K, V> {}
-
-// Test that trait types printed in error msgs include the type arguments.
-
-fn main() {
-    let x: Box<HashMap<isize, isize>> = HashMap::new().into();
-    let x: Box<dyn Map<isize, isize>> = x;
-    let y: Box<dyn Map<usize, isize>> = Box::new(x);
-    //~^ ERROR `Box<dyn Map<isize, isize>>: Map<usize, isize>` is not satisfied
-}