Trait constraints are separated by space, not comma

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 36f5bbe481967e1824328931a8c514765e40cf06..7509e43e4029caf831e0d670f18c0b54a3b046c1 100644 (file)
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2826,7 +2826,7 @@ fn parse_trait_ref() -> @trait_ref {
 
     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 8fe7b72f8e7d8e4543e8718684af3210bc6ee0e8..cdb3cfa1bc6a0fb33776a0a481e55a0a80f2fd48 100644 (file)
--- 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 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 551c0bd2e3686acc7dd32a0cd02e8bf0e59ca962..ba8ae0757e49b6b7222cc26cbb1f33ef9d5be7e2 100644 (file)
--- 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 4eac97102506a9a32dd6e531dd3c4b213ef4fc56..1da4eb161ddadcae0eb62511182a5428aed512d3 100644 (file)
--- 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 @@
 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 29de9f111dcbd5874426733d64910f79c8248e33..1c6d3ee2ccaf444b3a582156b7ea2c5e9aaf7abd 100644 (file)
--- a/src/test/run-pass/trait-inheritance-auto.rs
+++ b/src/test/run-pass/trait-inheritance-auto.rs
@@ -6,7 +6,7 @@ impl<T: Foo Bar Baz> T: Quux { }
 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 4c18d92a8c0d83375e5a844b1bb5390ae99cd698..e36dfe76bb096d24498de4f9b17f87f15c46a9a3 100644 (file)
--- 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 2266b67c23439ddd48f80a19b8974031b251bee5..7e00694604a9eb45f76905d4ce97c3f6e1b70aa2 100644 (file)
--- a/src/test/run-pass/trait-inheritance-num.rs
+++ b/src/test/run-pass/trait-inheritance-num.rs
@@ -4,9 +4,9 @@
 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 57487f072f38994f5401333acc91f84ebe5c91e1..94ac65670e8a5e16f241ce5f8ce8f86e41704ff7 100644 (file)
--- 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 5f51f943817d27394906d1f64fd0e004c5b0b82d..66489babc5b638f6cf9dc5ba2fa93f7757db2c34 100644 (file)
--- 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 656e63906621c0ba4a89ee4c6877123e0aa300b4..41ec9d0a226aade8228f2c2dc71e26bf69b6ed7b 100644 (file)
--- 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 fa30ceff8ad01ff451908e65751f5db18bdff86e..76a19da830d186327df62f81bae3c201b6edbf05 100644 (file)
--- 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 5f5ca11ffb8c656169b70f9123e73b9535cea9a9..7d5919752ca10721404068484d6ab6d745d3b2d6 100644 (file)
--- 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 e6f3f1fb99147211a48cfd76f324be4fc20acea4..7877cda1fe77371ebf114e15773aa0818c7712bd 100644 (file)
--- 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 7d4c2cacfeaad26fc078960ab71adff327b59c06..dfca75dabda1a37a7f98a62a74a67ae72ddb097b 100644 (file)
--- a/src/test/run-pass/trait-inheritance2.rs
+++ b/src/test/run-pass/trait-inheritance2.rs
@@ -2,7 +2,7 @@
 trait Bar { fn g() -> int; }
 trait Baz { fn h() -> int; }
 
-trait Quux: Foo, Bar, Baz { }
+trait Quux: Foo Bar Baz { }
 
 struct A { x: int }