begin tests/ui/structs-enums cleanup

tests/ui/structs-enums/auxiliary/cci_class_4.rs

@@ -1,41 +1,54 @@
-pub mod kitties {
-    pub struct cat {
-        meows : usize,
+use std::fmt;
 
-        pub how_hungry : isize,
-        pub name : String,
+#[derive(Clone)]
+pub struct Cat {
+    meows: usize,
+
+    pub how_hungry: isize,
+    pub name: String,
+}
+
+impl Cat {
+    pub fn speak(&mut self) {
+        self.meow();
     }
 
-    impl cat {
-        pub fn speak(&mut self) { self.meow(); }
-
-        pub fn eat(&mut self) -> bool {
-            if self.how_hungry > 0 {
-                println!("OM NOM NOM");
-                self.how_hungry -= 2;
-                return true;
-            } else {
-                println!("Not hungry!");
-                return false;
-            }
+    pub fn eat(&mut self) -> bool {
+        if self.how_hungry > 0 {
+            println!("OM NOM NOM");
+            self.how_hungry -= 2;
+            return true;
+        } else {
+            println!("Not hungry!");
+            return false;
         }
     }
 
-    impl cat {
-        pub fn meow(&mut self) {
-            println!("Meow");
-            self.meows += 1;
-            if self.meows % 5 == 0 {
-                self.how_hungry += 1;
-            }
+    pub fn noop(&self) {}
+}
+
+impl Cat {
+    pub fn meow(&mut self) {
+        println!("Meow");
+        self.meows += 1;
+        if self.meows % 5 == 0 {
+            self.how_hungry += 1;
         }
     }
+    pub fn meow_count(&self) -> usize {
+        self.meows
+    }
+}
 
-    pub fn cat(in_x : usize, in_y : isize, in_name: String) -> cat {
-        cat {
-            meows: in_x,
-            how_hungry: in_y,
-            name: in_name
-        }
+pub fn cat(in_x: usize, in_y: isize, in_name: String) -> Cat {
+    Cat { meows: in_x, how_hungry: in_y, name: in_name }
+}
+pub fn cat_unnamed(in_x: usize, in_y: isize) -> Cat {
+    Cat { meows: in_x, how_hungry: in_y, name: String::new() }
+}
+
+impl fmt::Display for Cat {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.name)
     }
 }

tests/ui/structs-enums/class-dtor.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]