Skip to content

Commit c0ca57a

Browse files
committed
Merge pull request #20771 from Kimundi/vec-macro-repeat
Enabled the `vec![]` macro to use the `[a; b]` repeat syntax. Reviewed-by: alexcrichton
2 parents a09b139 + c163eff commit c0ca57a

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

src/libcollections/macros.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -12,6 +12,10 @@
1212
#[macro_export]
1313
#[stable]
1414
macro_rules! vec {
15+
($x:expr; $y:expr) => ({
16+
let xs: $crate::boxed::Box<[_]> = $crate::boxed::Box::new([$x; $y]);
17+
$crate::slice::SliceExt::into_vec(xs)
18+
});
1519
($($x:expr),*) => ({
1620
let xs: $crate::boxed::Box<[_]> = $crate::boxed::Box::new([$($x),*]);
1721
$crate::slice::SliceExt::into_vec(xs)

src/test/run-pass/vec-macro-repeat.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
12+
pub fn main() {
13+
assert_eq!(vec![1; 3], vec![1, 1, 1]);
14+
assert_eq!(vec![1; 2], vec![1, 1]);
15+
assert_eq!(vec![1; 1], vec![1]);
16+
assert_eq!(vec![1; 0], vec![]);
17+
}

0 commit comments

Comments
 (0)