cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / max-min-classes.rs

diff --git a/src/test/run-pass/max-min-classes.rs b/src/test/run-pass/max-min-classes.rs
index 2062190217320afcba182cf023ddf0c70f7ed537..e3c375f8b0fdea321aa5019b6ae821bb6cf367fc 100644 (file)
--- a/src/test/run-pass/max-min-classes.rs
+++ b/src/test/run-pass/max-min-classes.rs
@@ -1,20 +1,30 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 trait Product {
-    fn product() -> int;
+    fn product(&self) -> int;
 }
 
 struct Foo {
-    x: int;
-    y: int;
+    x: int,
+    y: int,
 }
 
 impl Foo {
-    fn sum() -> int {
+    pub fn sum(&self) -> int {
         self.x + self.y
     }
 }
 
-impl Foo : Product {
-    fn product() -> int {
+impl Product for Foo {
+    fn product(&self) -> int {
         self.x * self.y
     }
 }
@@ -23,8 +33,7 @@ fn Foo(x: int, y: int) -> Foo {
     Foo { x: x, y: y }
 }
 
-fn main() {
+pub fn main() {
     let foo = Foo(3, 20);
-    io::println(fmt!("%d %d", foo.sum(), foo.product()));
+    println!("{} {}", foo.sum(), foo.product());
 }
-