nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 09:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: make vec!() macro handle a trailing comma

Browse Source 
Fixes #12910.
This commit is contained in:
Kang Seonghoon 2014-04-03 16:40:56 +09:00 committed by Alex Crichton
parent 87334fb05f
commit 7a281718f0
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libstd/macros.rs
View File

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

13
src/test/compile-fail/vec-macro-with-comma-only.rs Normal file
View File

@ -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
src/test/run-pass/vec-macro-with-trailing-comma.rs Normal file
View File

@ -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,));
}