syntax: Make match arm parsing more restrictive again

Require comma separators for all expression types except the plain block

8 files changed, 29 insertions, 29 deletions

diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index 4b1fa4bfac9..b0189139f42 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -186,9 +186,9 @@ class bitv {
                   intersect  => s.intersect(s1),
                   assign     => s.become(s1),
                   difference => s.difference(s1)
-                }
+                },
                 big(s1) => self.die()
-              }
+              },
               big(s) => match other.rep {
                 small(_) => self.die(),
                 big(s1) => match op {
@@ -282,7 +282,7 @@ class bitv {
         small(b) => match v1.rep {
           small(b1) => b.equals(b1),
           _ => false
-        }
+        },
         big(s) => match v1.rep {
           big(s1) => s.equals(s1),
           small(_) => return false
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index 8293e4f215c..c7d0d1e5be8 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -242,11 +242,11 @@ mod tests {
               one(a1) => match b {
                 one(b1) => return a1 == b1,
                 _ => return false
-              }
+              },
               two(a1, a2) => match b {
                 two(b1, b2) => return a1 == b1 && a2 == b2,
                 _ => return false
-              }
+              },
               three(a1, a2, a3) => match b {
                 three(b1, b2, b3) => return a1 == b1 && a2 == b2 && a3 == b3,
                 _ => return false
@@ -258,11 +258,11 @@ mod tests {
               onepar::<T>(a1) => match b {
                 onepar::<T>(b1) => return a1 == b1,
                 _ => return false
-              }
+              },
               twopar::<T>(a1, a2) => match b {
                 twopar::<T>(b1, b2) => return a1 == b1 && a2 == b2,
                 _ => return false
-              }
+              },
               threepar::<T>(a1, a2, a3) => match b {
                 threepar::<T>(b1, b2, b3) => {
                     return a1 == b1 && a2 == b2 && a3 == b3
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index f3ca79be02b..882c6147b24 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -172,7 +172,7 @@ impl parser for parser {
           '"' => match self.parse_str() {
             ok(s) => ok(string(s)),
             err(e) => err(e)
-          }
+          },
           '[' => self.parse_list(),
           '{' => self.parse_object(),
           _ => self.error(~"invalid syntax")
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index d0b08212952..00c489c1daa 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -54,7 +54,7 @@ fn format_addr(ip: ip_addr) -> ~str {
             fail ~"failed to convert inner sockaddr_in address to str"
         }
         result
-      }
+      },
       ipv6(addr) => unsafe {
         let result = uv_ip6_name(&addr);
         if result == ~"" {
diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs
index 86421ea3e74..ce9b73af471 100644
--- a/src/libstd/serialization.rs
+++ b/src/libstd/serialization.rs
@@ -245,7 +245,7 @@ fn serialize_option<S: serializer,T>(s: S, v: option<T>, st: fn(T)) {
     do s.emit_enum(~"option") {
         match v {
           none => do s.emit_enum_variant(~"none", 0u, 0u) {
-          }
+          },
 
           some(v) => do s.emit_enum_variant(~"some", 1u, 1u) {
             do s.emit_enum_variant_arg(0u) {
diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs
index 6ed2a397b3f..de9af5d44f4 100644
--- a/src/libstd/smallintmap.rs
+++ b/src/libstd/smallintmap.rs
@@ -104,7 +104,7 @@ impl <V: copy> of map::map<uint, V> for smallintmap<V> {
         let mut idx = 0u, l = self.v.len();
         while idx < l {
             match self.v.get_elt(idx) {
-              some(elt) => if !it(idx, elt) { break }
+              some(elt) => if !it(idx, elt) { break },
               none => ()
             }
             idx += 1u;
@@ -120,7 +120,7 @@ impl <V: copy> of map::map<uint, V> for smallintmap<V> {
         let mut idx = 0u, l = self.v.len();
         while idx < l {
             match self.v.get_elt(idx) {
-              some(elt) => if !it(&idx, &elt) { break }
+              some(elt) => if !it(&idx, &elt) { break },
               none => ()
             }
             idx += 1u;
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index b67d7e66402..6dd0ec209f5 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -146,7 +146,7 @@ fn run_tests_console(opts: test_opts,
           result::err(s) => {
               fail(fmt!{"can't open output file: %s", s})
           }
-        }
+        },
         none => none
     };
 
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 3a4b5f3ccd9..b654b0f1d4f 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -220,7 +220,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
           ]) {
             some(item) => { let (v, pos) = item; tm.tm_wday = v; ok(pos) }
             none => err(~"Invalid day")
-          }
+          },
           'a' => match match_strs(s, pos, ~[
               (~"Sun", 0_i32),
               (~"Mon", 1_i32),
@@ -232,7 +232,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
           ]) {
             some(item) => { let (v, pos) = item; tm.tm_wday = v; ok(pos) }
             none => err(~"Invalid day")
-          }
+          },
           'B' => match match_strs(s, pos, ~[
               (~"January", 0_i32),
               (~"February", 1_i32),
@@ -249,7 +249,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
           ]) {
             some(item) => { let (v, pos) = item; tm.tm_mon = v; ok(pos) }
             none => err(~"Invalid month")
-          }
+          },
           'b' | 'h' => match match_strs(s, pos, ~[
               (~"Jan", 0_i32),
               (~"Feb", 1_i32),
@@ -266,7 +266,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
           ]) {
             some(item) => { let (v, pos) = item; tm.tm_mon = v; ok(pos) }
             none => err(~"Invalid month")
-          }
+          },
           'C' => match match_digits(s, pos, 2u, false) {
             some(item) => {
                 let (v, pos) = item;
@@ -274,7 +274,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
                   ok(pos)
               }
             none => err(~"Invalid year")
-          }
+          },
           'c' => {
             parse_type(s, pos, 'a', tm)
                 .chain(|pos| parse_char(s, pos, ' '))
@@ -296,11 +296,11 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
           'd' => match match_digits(s, pos, 2u, false) {
             some(item) => { let (v, pos) = item; tm.tm_mday = v; ok(pos) }
             none => err(~"Invalid day of the month")
-          }
+          },
           'e' => match match_digits(s, pos, 2u, true) {
             some(item) => { let (v, pos) = item; tm.tm_mday = v; ok(pos) }
             none => err(~"Invalid day of the month")
-          }
+          },
           'F' => {
             parse_type(s, pos, 'Y', tm)
                 .chain(|pos| parse_char(s, pos, '-'))
@@ -379,13 +379,13 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
 
             some(item) => { let (v, pos) = item; tm.tm_hour += v; ok(pos) }
             none => err(~"Invalid hour")
-          }
+          },
           'p' => match match_strs(s, pos,
                                   ~[(~"AM", 0_i32), (~"PM", 12_i32)]) {
 
             some(item) => { let (v, pos) = item; tm.tm_hour += v; ok(pos) }
             none => err(~"Invalid hour")
-          }
+          },
           'R' => {
             parse_type(s, pos, 'H', tm)
                 .chain(|pos| parse_char(s, pos, ':'))
@@ -542,7 +542,7 @@ fn strptime(s: ~str, format: ~str) -> result<tm, ~str> {
               '%' => match parse_type(s, pos, rdr.read_char(), tm) {
                 ok(next) => pos = next,
                   err(e) => { result = err(e); break; }
-              }
+              },
               c => {
                 if c != ch { break }
                 pos = next;
@@ -581,7 +581,7 @@ fn strftime(format: ~str, tm: tm) -> ~str {
             4 => ~"Thursday",
             5 => ~"Friday",
             6 => ~"Saturday"
-          }
+          },
           'a' => match check tm.tm_wday as int {
             0 => ~"Sun",
             1 => ~"Mon",
@@ -590,7 +590,7 @@ fn strftime(format: ~str, tm: tm) -> ~str {
             4 => ~"Thu",
             5 => ~"Fri",
             6 => ~"Sat"
-          }
+          },
           'B' => match check tm.tm_mon as int {
             0 => ~"January",
             1 => ~"February",
@@ -604,7 +604,7 @@ fn strftime(format: ~str, tm: tm) -> ~str {
             9 => ~"October",
             10 => ~"November",
             11 => ~"December"
-          }
+          },
           'b' | 'h' => match check tm.tm_mon as int {
             0 => ~"Jan",
             1 => ~"Feb",
@@ -618,7 +618,7 @@ fn strftime(format: ~str, tm: tm) -> ~str {
             9 => ~"Oct",
             10 => ~"Nov",
             11 => ~"Dec",
-          }
+          },
           'C' => fmt!{"%02d", (tm.tm_year as int + 1900) / 100},
           'c' => {
             fmt!{"%s %s %s %s %s",
@@ -662,8 +662,8 @@ fn strftime(format: ~str, tm: tm) -> ~str {
           'M' => fmt!{"%02d", tm.tm_min as int},
           'm' => fmt!{"%02d", tm.tm_mon as int + 1},
           'n' => ~"\n",
-          'P' => if tm.tm_hour as int < 12 { ~"am" } else { ~"pm" }
-          'p' => if tm.tm_hour as int < 12 { ~"AM" } else { ~"PM" }
+          'P' => if tm.tm_hour as int < 12 { ~"am" } else { ~"pm" },
+          'p' => if tm.tm_hour as int < 12 { ~"AM" } else { ~"PM" },
           'R' => {
             fmt!{"%s:%s",
                 parse_type('H', tm),