Trait constraints are separated by space, not comma

14 files changed, 21 insertions, 21 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 36f5bbe4819..7509e43e402 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2826,7 +2826,7 @@ impl Parser {
 
     fn parse_trait_ref_list(ket: token::Token) -> ~[@trait_ref] {
         self.parse_seq_to_before_end(
-            ket, seq_sep_trailing_disallowed(token::COMMA),
+            ket, seq_sep_none(),
             |p| p.parse_trait_ref())
     }
 
diff --git a/src/test/auxiliary/trait_inheritance_auto_xc_aux.rs b/src/test/auxiliary/trait_inheritance_auto_xc_aux.rs
index 8fe7b72f8e7..cdb3cfa1bc6 100644
--- a/src/test/auxiliary/trait_inheritance_auto_xc_aux.rs
+++ b/src/test/auxiliary/trait_inheritance_auto_xc_aux.rs
@@ -2,6 +2,6 @@ trait Foo { fn f() -> int; }
 trait Bar { fn g() -> int; }
 trait Baz { fn h() -> int; }
 
-trait Quux: Foo, Bar, Baz { }
+trait Quux: Foo Bar Baz { }
 
 impl<T: Foo Bar Baz> T: Quux { }
diff --git a/src/test/compile-fail/issue-3953.rs b/src/test/compile-fail/issue-3953.rs
index 551c0bd2e36..ba8ae0757e4 100644
--- a/src/test/compile-fail/issue-3953.rs
+++ b/src/test/compile-fail/issue-3953.rs
@@ -1,11 +1,11 @@
 use cmp::Eq;
 
-trait Hahaha: Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, //~ ERROR Duplicate supertrait in trait declaration
-              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
-              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
-              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
-              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq,
-              Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq, Eq {}
+trait Hahaha: Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq //~ ERROR Duplicate supertrait in trait declaration
+              Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq
+              Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq
+              Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq
+              Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq
+              Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq Eq {}
 
 enum Lol = int;
 
diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
index 4eac9710250..1da4eb161dd 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs
+++ b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
@@ -7,7 +7,7 @@ extern mod aux(name = "trait_inheritance_auto_xc_2_aux");
 use aux::{Foo, Bar, Baz, A};
 
 // We want to extend all Foo, Bar, Bazes to Quuxes
-pub trait Quux: Foo, Bar, Baz { }
+pub trait Quux: Foo Bar Baz { }
 impl<T: Foo Bar Baz> T: Quux { }
 
 fn f<T: Quux>(a: &T) {
diff --git a/src/test/run-pass/trait-inheritance-auto.rs b/src/test/run-pass/trait-inheritance-auto.rs
index 29de9f111dc..1c6d3ee2cca 100644
--- a/src/test/run-pass/trait-inheritance-auto.rs
+++ b/src/test/run-pass/trait-inheritance-auto.rs
@@ -6,7 +6,7 @@ trait Foo { fn f() -> int; }
 trait Bar { fn g() -> int; }
 trait Baz { fn h() -> int; }
 
-trait Quux: Foo, Bar, Baz { }
+trait Quux: Foo Bar Baz { }
 
 struct A { x: int }
 
diff --git a/src/test/run-pass/trait-inheritance-diamond.rs b/src/test/run-pass/trait-inheritance-diamond.rs
index 4c18d92a8c0..e36dfe76bb0 100644
--- a/src/test/run-pass/trait-inheritance-diamond.rs
+++ b/src/test/run-pass/trait-inheritance-diamond.rs
@@ -3,7 +3,7 @@
 trait A { fn a(&self) -> int; }
 trait B: A { fn b(&self) -> int; }
 trait C: A { fn c(&self) -> int; }
-trait D: B, C { fn d(&self) -> int; }
+trait D: B C { fn d(&self) -> int; }
 
 struct S { bogus: () }
 
diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs
index 2266b67c234..7e00694604a 100644
--- a/src/test/run-pass/trait-inheritance-num.rs
+++ b/src/test/run-pass/trait-inheritance-num.rs
@@ -4,9 +4,9 @@ use num::from_int;
 extern mod std;
 use std::cmp::FuzzyEq;
 
-pub trait NumExt: Num, Eq, Ord {}
+pub trait NumExt: Num Eq Ord {}
 
-pub trait FloatExt: NumExt, FuzzyEq {}
+pub trait FloatExt: NumExt FuzzyEq {}
 
 fn greater_than_one<T:NumExt>(n: &T) -> bool { *n > from_int(1) }
 fn greater_than_one_float<T:FloatExt>(n: &T) -> bool { *n > from_int(1) }
diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs
index 57487f072f3..94ac65670e8 100644
--- a/src/test/run-pass/trait-inheritance-num1.rs
+++ b/src/test/run-pass/trait-inheritance-num1.rs
@@ -3,7 +3,7 @@
 use cmp::Ord;
 use num::from_int;
 
-pub trait NumExt: Num, Ord { }
+pub trait NumExt: Num Ord { }
 
 fn greater_than_one<T:NumExt>(n: &T) -> bool {
     *n > from_int(1)
diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs
index 5f51f943817..66489babc5b 100644
--- a/src/test/run-pass/trait-inheritance-num2.rs
+++ b/src/test/run-pass/trait-inheritance-num2.rs
@@ -26,7 +26,7 @@ pub impl f64: TypeExt {}
 pub impl float: TypeExt {}
 
 
-pub trait NumExt: TypeExt, Eq, Ord, Num {}
+pub trait NumExt: TypeExt Eq Ord Num {}
 
 pub impl u8: NumExt {}
 pub impl u16: NumExt {}
@@ -82,7 +82,7 @@ pub impl i64: IntegerExt {}
 pub impl int: IntegerExt {}
 
 
-pub trait FloatExt: NumExt , FuzzyEq {}
+pub trait FloatExt: NumExt FuzzyEq {}
 
 pub impl f32: FloatExt {}
 pub impl f64: FloatExt {}
diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs
index 656e6390662..41ec9d0a226 100644
--- a/src/test/run-pass/trait-inheritance-num3.rs
+++ b/src/test/run-pass/trait-inheritance-num3.rs
@@ -1,7 +1,7 @@
 use cmp::{Eq, Ord};
 use num::from_int;
 
-pub trait NumExt: Eq, Ord, Num {}
+pub trait NumExt: Eq Ord Num {}
 
 pub impl f32: NumExt {}
 
diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs
index fa30ceff8ad..76a19da830d 100644
--- a/src/test/run-pass/trait-inheritance-num5.rs
+++ b/src/test/run-pass/trait-inheritance-num5.rs
@@ -1,7 +1,7 @@
 use cmp::{Eq, Ord};
 use num::from_int;
 
-pub trait NumExt: Eq, Num {}
+pub trait NumExt: Eq Num {}
 
 pub impl f32: NumExt {}
 pub impl int: NumExt {}
diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/run-pass/trait-inheritance-overloading.rs
index 5f5ca11ffb8..7d5919752ca 100644
--- a/src/test/run-pass/trait-inheritance-overloading.rs
+++ b/src/test/run-pass/trait-inheritance-overloading.rs
@@ -1,6 +1,6 @@
 use cmp::Eq;
 
-trait MyNum : Add<self,self>, Sub<self,self>, Mul<self,self>, Eq { }
+trait MyNum : Add<self,self> Sub<self,self> Mul<self,self> Eq { }
 
 struct MyInt { val: int }
 
diff --git a/src/test/run-pass/trait-inheritance-static2.rs b/src/test/run-pass/trait-inheritance-static2.rs
index e6f3f1fb991..7877cda1fe7 100644
--- a/src/test/run-pass/trait-inheritance-static2.rs
+++ b/src/test/run-pass/trait-inheritance-static2.rs
@@ -4,7 +4,7 @@ trait MyNum {
     static fn from_int(int) -> self;
 }
 
-pub trait NumExt: MyEq, MyNum { }
+pub trait NumExt: MyEq MyNum { }
 
 struct S { v: int }
 
diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/run-pass/trait-inheritance2.rs
index 7d4c2cacfea..dfca75dabda 100644
--- a/src/test/run-pass/trait-inheritance2.rs
+++ b/src/test/run-pass/trait-inheritance2.rs
@@ -2,7 +2,7 @@ trait Foo { fn f() -> int; }
 trait Bar { fn g() -> int; }
 trait Baz { fn h() -> int; }
 
-trait Quux: Foo, Bar, Baz { }
+trait Quux: Foo Bar Baz { }
 
 struct A { x: int }