---

yaml
---
r: 41909
b: refs/heads/master
c: 778aec9
h: refs/heads/master
i:
  41907: 235acc2
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1871f3a70baf203e31c7e72b13715924bebd3ad7
+refs/heads/master: 778aec998b0a4a34632b22abd8c1cfa599fe78f0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libsyntax/parse/parser.rs

@@ -2531,6 +2531,10 @@ impl Parser {
                 } else {
                     break;
                 }
+
+                if self.eat(token::BINOP(token::PLUS)) {
+                    // Should be `break;` but that isn't backwards compatible.
+                }
             }
         }
         return @move bounds;

trunk/src/libsyntax/print/pprust.rs

@@ -1791,8 +1791,15 @@ fn print_arg_mode(s: ps, m: ast::mode) {
 fn print_bounds(s: ps, bounds: @~[ast::ty_param_bound]) {
     if bounds.is_not_empty() {
         word(s.s, ~":");
+        let mut first = true;
         for vec::each(*bounds) |&bound| {
             nbsp(s);
+            if first {
+                first = false;
+            } else {
+                word_space(s, ~"+");
+            }
+
             match bound {
                 TraitTyParamBound(ty) => print_type(s, ty),
                 RegionTyParamBound => word(s.s, ~"&static"),

trunk/src/test/run-pass/multiple-trait-bounds.rs

@@ -0,0 +1,7 @@
+fn f<T:Eq + Ord>(_: T) {
+}
+
+fn main() {
+    f(3);
+}
+