---

yaml
---
r: 110547
b: refs/heads/master
c: 7a28171
h: refs/heads/master
i:
  110545: a302940
  110543: e09888b
v: v3

Author: lifthrasiir

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 87334fb05ff2a665419241d877c13d6c4770a3f4
+refs/heads/master: 7a281718f0d32ea678f031252c0e130035fc2a80
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: e263ef1df7b892ed29e53313565eb05ab75e52f4
 refs/heads/try: 597a645456b55e1c886ce15d23a192abdf4d55cf

trunk/src/libstd/macros.rs

@@ -273,7 +273,8 @@ macro_rules! vec(
         let mut _temp = ::std::vec::Vec::new();
         $(_temp.push($e);)*
         _temp
-    })
+    });
+    ($($e:expr),+,) => (vec!($($e),+))
 )
 
 

trunk/src/test/compile-fail/vec-macro-with-comma-only.rs

@@ -0,0 +1,13 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub fn main() {
+    vec!(,); //~ ERROR unexpected token
+}

trunk/src/test/run-pass/vec-macro-with-trailing-comma.rs

@@ -0,0 +1,15 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+pub fn main() {
+    assert_eq!(vec!(1), vec!(1,));
+    assert_eq!(vec!(1, 2, 3), vec!(1, 2, 3,));
+}