Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/structs-enums/class-poly-methods.rs b/src/test/ui/structs-enums/class-poly-methods.rs
deleted file mode 100644
index da2870b58..000000000
--- a/src/test/ui/structs-enums/class-poly-methods.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(non_camel_case_types)]
-
-
-struct cat<U> {
-    info : Vec<U> ,
-    meows : usize,
-
-    how_hungry : isize,
-}
-
-impl<U> cat<U> {
-    pub fn speak<T>(&mut self, stuff: Vec<T> ) {
-        self.meows += stuff.len();
-    }
-    pub fn meow_count(&mut self) -> usize { self.meows }
-}
-
-fn cat<U>(in_x : usize, in_y : isize, in_info: Vec<U> ) -> cat<U> {
-    cat {
-        meows: in_x,
-        how_hungry: in_y,
-        info: in_info
-    }
-}
-
-pub fn main() {
-  let mut nyan : cat<isize> = cat::<isize>(52, 99, vec![9]);
-  let mut kitty = cat(1000, 2, vec!["tabby".to_string()]);
-  assert_eq!(nyan.how_hungry, 99);
-  assert_eq!(kitty.how_hungry, 2);
-  nyan.speak(vec![1,2,3]);
-  assert_eq!(nyan.meow_count(), 55);
-  kitty.speak(vec!["meow".to_string(), "mew".to_string(), "purr".to_string(), "chirp".to_string()]);
-  assert_eq!(kitty.meow_count(), 1004);
-}