diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-09-19 12:09:52 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-09-24 14:12:02 -0700 |
| commit | 4b266f1c0df9732bbdea44b0df3d459d4cf2756d (patch) | |
| tree | 001f53c217538001b4dcc2b5388da2aafe7403b6 /src/test | |
| parent | 4dacd736510b2ae28a54489fe88571f1a6de019f (diff) | |
| download | rust-4b266f1c0df9732bbdea44b0df3d459d4cf2756d.tar.gz rust-4b266f1c0df9732bbdea44b0df3d459d4cf2756d.zip | |
Stop accepting 'impl ...;', require {} instead
Progress on #7981
Diffstat (limited to 'src/test')
19 files changed, 21 insertions, 21 deletions
diff --git a/src/test/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/auxiliary/trait_inheritance_overloading_xc.rs index f938c9c56ed..8694871417a 100644 --- a/src/test/auxiliary/trait_inheritance_overloading_xc.rs +++ b/src/test/auxiliary/trait_inheritance_overloading_xc.rs @@ -35,6 +35,6 @@ impl Eq for MyInt { fn ne(&self, other: &MyInt) -> bool { !self.eq(other) } } -impl MyNum for MyInt; +impl MyNum for MyInt {} fn mi(v: int) -> MyInt { MyInt { val: v } } diff --git a/src/test/compile-fail/missing-derivable-attr.rs b/src/test/compile-fail/missing-derivable-attr.rs index eb27d51061f..70c16e0baef 100644 --- a/src/test/compile-fail/missing-derivable-attr.rs +++ b/src/test/compile-fail/missing-derivable-attr.rs @@ -20,7 +20,7 @@ impl MyEq for int { fn eq(&self, other: &int) -> bool { *self == *other } } -impl MyEq for A; //~ ERROR missing method +impl MyEq for A {} //~ ERROR missing method fn main() { } diff --git a/src/test/debug-info/generic-trait-generic-static-default-method.rs b/src/test/debug-info/generic-trait-generic-static-default-method.rs index 8523a947aac..4355b4b98fe 100644 --- a/src/test/debug-info/generic-trait-generic-static-default-method.rs +++ b/src/test/debug-info/generic-trait-generic-static-default-method.rs @@ -40,7 +40,7 @@ trait Trait<T1> { } } -impl<T> Trait<T> for Struct; +impl<T> Trait<T> for Struct {} fn main() { diff --git a/src/test/debug-info/self-in-default-method.rs b/src/test/debug-info/self-in-default-method.rs index 53b2e9ee21d..fde58f76acc 100644 --- a/src/test/debug-info/self-in-default-method.rs +++ b/src/test/debug-info/self-in-default-method.rs @@ -118,7 +118,7 @@ trait Trait { } } -impl Trait for Struct; +impl Trait for Struct {} fn main() { let stack = Struct { x: 100 }; diff --git a/src/test/debug-info/self-in-generic-default-method.rs b/src/test/debug-info/self-in-generic-default-method.rs index 47f58930760..3daf7afd4b1 100644 --- a/src/test/debug-info/self-in-generic-default-method.rs +++ b/src/test/debug-info/self-in-generic-default-method.rs @@ -119,7 +119,7 @@ trait Trait { } } -impl Trait for Struct; +impl Trait for Struct {} fn main() { let stack = Struct { x: 987 }; diff --git a/src/test/debug-info/trait-generic-static-default-method.rs b/src/test/debug-info/trait-generic-static-default-method.rs index 1f6e6992e27..05258d53586 100644 --- a/src/test/debug-info/trait-generic-static-default-method.rs +++ b/src/test/debug-info/trait-generic-static-default-method.rs @@ -40,7 +40,7 @@ trait Trait { } } -impl Trait for Struct; +impl Trait for Struct {} fn main() { diff --git a/src/test/pretty/empty-impl.pp b/src/test/pretty/empty-impl.pp index af401bd25ca..685cdcdaead 100644 --- a/src/test/pretty/empty-impl.pp +++ b/src/test/pretty/empty-impl.pp @@ -1,5 +1,5 @@ trait X { } -impl X for uint; +impl X for uint { } trait Y { } -impl Y for uint; +impl Y for uint { } diff --git a/src/test/pretty/empty-impl.rs b/src/test/pretty/empty-impl.rs index af401bd25ca..685cdcdaead 100644 --- a/src/test/pretty/empty-impl.rs +++ b/src/test/pretty/empty-impl.rs @@ -1,5 +1,5 @@ trait X { } -impl X for uint; +impl X for uint { } trait Y { } -impl Y for uint; +impl Y for uint { } diff --git a/src/test/pretty/path-type-bounds.rs b/src/test/pretty/path-type-bounds.rs index a62fbdeeb18..4a402132254 100644 --- a/src/test/pretty/path-type-bounds.rs +++ b/src/test/pretty/path-type-bounds.rs @@ -1,7 +1,7 @@ // pp-exact trait Tr { } -impl Tr for int; +impl Tr for int { } fn foo(x: ~Tr: Freeze) -> ~Tr: Freeze { x } diff --git a/src/test/run-pass/default-method-supertrait-vtable.rs b/src/test/run-pass/default-method-supertrait-vtable.rs index 90a2b914021..b5790269d90 100644 --- a/src/test/run-pass/default-method-supertrait-vtable.rs +++ b/src/test/run-pass/default-method-supertrait-vtable.rs @@ -29,7 +29,7 @@ impl Y for int { fn y(self) -> int { self } } -impl Z for int; +impl Z for int {} fn main() { assert_eq!(12.x(), 12); diff --git a/src/test/run-pass/issue-3979-generics.rs b/src/test/run-pass/issue-3979-generics.rs index 867301121da..86cdd6135ec 100644 --- a/src/test/run-pass/issue-3979-generics.rs +++ b/src/test/run-pass/issue-3979-generics.rs @@ -31,7 +31,7 @@ impl Positioned<int> for Point { } } -impl Movable<int> for Point; +impl Movable<int> for Point {} pub fn main() { let mut p = Point{ x: 1, y: 2}; diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/run-pass/issue-3979-xcrate.rs index caf6d202316..63d2562f541 100644 --- a/src/test/run-pass/issue-3979-xcrate.rs +++ b/src/test/run-pass/issue-3979-xcrate.rs @@ -24,7 +24,7 @@ impl Positioned for Point { } } -impl Movable for Point; +impl Movable for Point {} pub fn main() { let mut p = Point{ x: 1, y: 2}; diff --git a/src/test/run-pass/issue-3979.rs b/src/test/run-pass/issue-3979.rs index 2e53fb5d3f9..4f69342830b 100644 --- a/src/test/run-pass/issue-3979.rs +++ b/src/test/run-pass/issue-3979.rs @@ -32,7 +32,7 @@ impl Positioned for Point { } } -impl Movable for Point; +impl Movable for Point {} pub fn main() { let mut p = Point{ x: 1, y: 2}; diff --git a/src/test/run-pass/supertrait-default-generics.rs b/src/test/run-pass/supertrait-default-generics.rs index ae7e18d532b..2cfc22111a7 100644 --- a/src/test/run-pass/supertrait-default-generics.rs +++ b/src/test/run-pass/supertrait-default-generics.rs @@ -33,7 +33,7 @@ impl<S: Clone> Positioned<S> for Point<S> { } } -impl<S: Clone + Add<S, S>> Movable<S> for Point<S>; +impl<S: Clone + Add<S, S>> Movable<S> for Point<S> {} pub fn main() { let mut p = Point{ x: 1, y: 2}; diff --git a/src/test/run-pass/trait-inheritance-overloading-simple.rs b/src/test/run-pass/trait-inheritance-overloading-simple.rs index 041452176e0..3a0f2dd9464 100644 --- a/src/test/run-pass/trait-inheritance-overloading-simple.rs +++ b/src/test/run-pass/trait-inheritance-overloading-simple.rs @@ -19,7 +19,7 @@ impl Eq for MyInt { fn ne(&self, other: &MyInt) -> bool { !self.eq(other) } } -impl MyNum for MyInt; +impl MyNum for MyInt {} fn f<T:MyNum>(x: T, y: T) -> bool { return x == y; diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/run-pass/trait-inheritance-overloading.rs index d5321ea5298..fb19bfa674f 100644 --- a/src/test/run-pass/trait-inheritance-overloading.rs +++ b/src/test/run-pass/trait-inheritance-overloading.rs @@ -31,7 +31,7 @@ impl Eq for MyInt { fn ne(&self, other: &MyInt) -> bool { !self.eq(other) } } -impl MyNum for MyInt; +impl MyNum for MyInt {} fn f<T:MyNum>(x: T, y: T) -> (T, T, T) { return (x + y, x - y, x * y); diff --git a/src/test/run-pass/trait-inheritance-subst.rs b/src/test/run-pass/trait-inheritance-subst.rs index 479f293a396..cd57e6a7dd0 100644 --- a/src/test/run-pass/trait-inheritance-subst.rs +++ b/src/test/run-pass/trait-inheritance-subst.rs @@ -20,7 +20,7 @@ impl Add<MyInt, MyInt> for MyInt { fn add(&self, other: &MyInt) -> MyInt { mi(self.val + other.val) } } -impl MyNum for MyInt; +impl MyNum for MyInt {} fn f<T:MyNum>(x: T, y: T) -> T { return x.add(&y); diff --git a/src/test/run-pass/trait-inheritance-subst2.rs b/src/test/run-pass/trait-inheritance-subst2.rs index 214505172a5..ebddfafc3b4 100644 --- a/src/test/run-pass/trait-inheritance-subst2.rs +++ b/src/test/run-pass/trait-inheritance-subst2.rs @@ -30,7 +30,7 @@ impl Add<MyInt, MyInt> for MyInt { fn add(&self, other: &MyInt) -> MyInt { self.chomp(other) } } -impl MyNum for MyInt; +impl MyNum for MyInt {} fn f<T:MyNum>(x: T, y: T) -> T { return x.add(&y).chomp(&y); diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/run-pass/trait-inheritance2.rs index 6046da41217..7fa895ddf98 100644 --- a/src/test/run-pass/trait-inheritance2.rs +++ b/src/test/run-pass/trait-inheritance2.rs @@ -19,7 +19,7 @@ struct A { x: int } 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; +impl Quux for A {} fn f<T:Quux + Foo + Bar + Baz>(a: &T) { assert_eq!(a.f(), 10); |
