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

[rust.git] / src / test / run-pass / trait-inheritance2.rs

diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/run-pass/trait-inheritance2.rs
index 7d4c2cacfeaad26fc078960ab71adff327b59c06..7fa895ddf988802b1896224c67f1448b1e119962 100644 (file)
--- a/src/test/run-pass/trait-inheritance2.rs
+++ b/src/test/run-pass/trait-inheritance2.rs
@@ -1,24 +1,33 @@
-trait Foo { fn f() -> int; }
-trait Bar { fn g() -> int; }
-trait Baz { fn h() -> int; }
+// 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 Quux: Foo, Bar, Baz { }
+trait Foo { fn f(&self) -> int; }
+trait Bar { fn g(&self) -> int; }
+trait Baz { fn h(&self) -> int; }
+
+trait Quux: Foo + Bar + Baz { }
 
 struct A { x: int }
 
-impl A : Foo { fn f() -> int { 10 } }
-impl A : Bar { fn g() -> int { 20 } }
-impl A : Baz { fn h() -> int { 30 } }
-impl A : Quux;
+impl Foo for A { fn f(&self) -> int { 10 } }
+impl Bar for A { fn g(&self) -> int { 20 } }
+impl Baz for A { fn h(&self) -> int { 30 } }
+impl Quux for A {}
 
-fn f<T: Quux Foo Bar Baz>(a: &T) {
-    assert a.f() == 10;
-    assert a.g() == 20;
-    assert a.h() == 30;
+fn f<T:Quux + Foo + Bar + Baz>(a: &T) {
+    assert_eq!(a.f(), 10);
+    assert_eq!(a.g(), 20);
+    assert_eq!(a.h(), 30);
 }
 
-fn main() {
+pub fn main() {
     let a = &A { x: 3 };
     f(a);
 }
-