syntax: Make match arm parsing more restrictive again

Require comma separators for all expression types except the plain block

4 files changed, 9 insertions, 9 deletions

diff --git a/src/libcore/dlist.rs b/src/libcore/dlist.rs
index 9d410c03d6a..0d96e029fb7 100644
--- a/src/libcore/dlist.rs
+++ b/src/libcore/dlist.rs
@@ -30,18 +30,18 @@ impl private_methods<T> for dlist_node<T> {
             some(neighbour) => match neighbour.prev {
               some(me) => if !box::ptr_eq(*self, *me) {
                   fail ~"Asymmetric next-link in dlist node."
-              }
+              },
               none => fail ~"One-way next-link in dlist node."
-            }
+            },
             none => ()
         }
         match self.prev {
             some(neighbour) => match neighbour.next {
               some(me) => if !box::ptr_eq(*me, *self) {
                   fail ~"Asymmetric prev-link in dlist node."
-              }
+              },
               none => fail ~"One-way prev-link in dlist node."
-            }
+            },
             none => ()
         }
     }
diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 07bbff42b94..516b3f3c929 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -445,7 +445,7 @@ fn homedir() -> option<path> {
           some(p)
         } else {
           secondary()
-        }
+        },
         none => secondary()
     };
 
diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs
index 4fa3d18c2a7..9bdff829264 100644
--- a/src/libcore/pipes.rs
+++ b/src/libcore/pipes.rs
@@ -425,7 +425,7 @@ fn try_recv<T: send, Tbuffer: send>(-p: recv_packet_buffered<T, Tbuffer>)
           }
           blocked => if first {
             fail ~"blocking on already blocked packet"
-          }
+          },
           full => {
             let mut payload = none;
             payload <-> p.payload;
@@ -717,7 +717,7 @@ struct send_packet_buffered<T: send, Tbuffer: send> {
             let header = ptr::addr_of(packet.header);
             //forget(packet);
             header
-          }
+          },
           none => fail ~"packet already consumed"
         }
     }
@@ -778,7 +778,7 @@ struct recv_packet_buffered<T: send, Tbuffer: send> : selectable {
             let header = ptr::addr_of(packet.header);
             //forget(packet);
             header
-          }
+          },
           none => fail ~"packet already consumed"
         }
     }
diff --git a/src/libcore/send_map.rs b/src/libcore/send_map.rs
index 04dc25a2c11..e865bac41ed 100644
--- a/src/libcore/send_map.rs
+++ b/src/libcore/send_map.rs
@@ -118,7 +118,7 @@ mod linear {
                 match buckets[i] {
                   some(bkt) => if bkt.hash == hash && self.eqfn(k, &bkt.key) {
                     return found_entry(i);
-                  }
+                  },
                   none => return found_hole(i)
                 }
             };