Skip to content

Commit

Permalink
std: make vec!() macro handle a trailing comma
Browse files Browse the repository at this point in the history
Fixes #12910.
  • Loading branch information
lifthrasiir authored and alexcrichton committed Apr 8, 2014
1 parent 87334fb commit 7a28171
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/libstd/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ macro_rules! vec(
let mut _temp = ::std::vec::Vec::new();
$(_temp.push($e);)*
_temp
})
});
($($e:expr),+,) => (vec!($($e),+))
)


Expand Down
13 changes: 13 additions & 0 deletions src/test/compile-fail/vec-macro-with-comma-only.rs
Original file line number Diff line number Diff line change
@@ -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
}
15 changes: 15 additions & 0 deletions src/test/run-pass/vec-macro-with-trailing-comma.rs
Original file line number Diff line number Diff line change
@@ -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,));
}

0 comments on commit 7a28171

Please sign in to comment.