Removed most instances of vec!(..) and replaced them with vec![..]s

mk/crates.mk

@@ -121,7 +121,7 @@ DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_bo
  rustc_trans rustc_privacy rustc_lint rustc_plugin \
  rustc_metadata syntax_ext proc_macro_plugin \
  rustc_passes rustc_save_analysis rustc_const_eval \
- rustc_incremental syntax_pos rustc_errors proc_macro
+ rustc_incremental syntax_pos rustc_errors proc_macro rustc_data_structures
 DEPS_rustc_errors := log libc serialize syntax_pos
 DEPS_rustc_lint := rustc log syntax syntax_pos rustc_const_eval
 DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags

src/libcollections/slice.rs

@@ -1170,7 +1170,7 @@ impl<T> [T] {
  /// let x = s.into_vec();
  /// // `s` cannot be used anymore because it has been converted into `x`.
  ///
- /// assert_eq!(x, vec!(10, 40, 30));
+ /// assert_eq!(x, vec![10, 40, 30]);
  /// ```
  #[stable(feature = "rust1", since = "1.0.0")]
  #[inline]

src/libcollections/vec.rs

@@ -148,15 +148,15 @@ use super::range::RangeArgument;
 /// [`Index`] trait. An example will be more explicit:
 ///
 /// ```
-/// let v = vec!(0, 2, 4, 6);
+/// let v = vec![0, 2, 4, 6];
 /// println!("{}", v[1]); // it will display '2'
 /// ```
 ///
 /// However be careful: if you try to access an index which isn't in the `Vec`,
 /// your software will panic! You cannot do this:
 ///
 /// ```ignore
-/// let v = vec!(0, 2, 4, 6);
+/// let v = vec![0, 2, 4, 6];
 /// println!("{}", v[6]); // it will panic!
 /// ```
 ///
@@ -173,7 +173,7 @@ use super::range::RangeArgument;
 /// // ...
 /// }
 ///
-/// let v = vec!(0, 1);
+/// let v = vec![0, 1];
 /// read_slice(&v);
 ///
 /// // ... and that's all!

src/libcore/option.rs

@@ -914,12 +914,12 @@ impl<A, V: FromIterator<A>> FromIterator<Option<A>> for Option<V> {
  /// ```
  /// use std::u16;
  ///
- /// let v = vec!(1, 2);
+ /// let v = vec![1, 2];
  /// let res: Option<Vec<u16>> = v.iter().map(|&x: &u16|
  /// if x == u16::MAX { None }
  /// else { Some(x + 1) }
  /// ).collect();
- /// assert!(res == Some(vec!(2, 3)));
+ /// assert!(res == Some(vec![2, 3]));
  /// ```
  #[inline]
  fn from_iter<I: IntoIterator<Item=Option<A>>>(iter: I) -> Option<V> {

src/libcore/result.rs

@@ -977,12 +977,12 @@ impl<A, E, V: FromIterator<A>> FromIterator<Result<A, E>> for Result<V, E> {
  /// ```
  /// use std::u32;
  ///
- /// let v = vec!(1, 2);
+ /// let v = vec![1, 2];
  /// let res: Result<Vec<u32>, &'static str> = v.iter().map(|&x: &u32|
  /// if x == u32::MAX { Err("Overflow!") }
  /// else { Ok(x + 1) }
  /// ).collect();
- /// assert!(res == Ok(vec!(2, 3)));
+ /// assert!(res == Ok(vec![2, 3]));
  /// ```
  #[inline]
  fn from_iter<I: IntoIterator<Item=Result<A, E>>>(iter: I) -> Result<V, E> {

src/libgetopts/lib.rs

@@ -1610,8 +1610,8 @@ Options:
 
  #[test]
  fn test_args_with_equals() {
- let args = vec!("--one".to_string(), "A=B".to_string(),
- "--two=C=D".to_string());
+ let args = vec!["--one".to_string(), "A=B".to_string(),
+ "--two=C=D".to_string()];
  let opts = vec![optopt("o", "one", "One", "INFO"),
  optopt("t", "two", "Two", "INFO")];
  let matches = &match getopts(&args, &opts) {

src/libgraphviz/lib.rs

@@ -58,7 +58,7 @@
 //! struct Edges(Vec<Ed>);
 //!
 //! pub fn render_to<W: Write>(output: &mut W) {
-//! let edges = Edges(vec!((0,1), (0,2), (1,3), (2,3), (3,4), (4,4)));
+//! let edges = Edges(vec![(0,1), (0,2), (1,3), (2,3), (3,4), (4,4)]);
 //! dot::render(&edges, output).unwrap()
 //! }
 //!
@@ -164,8 +164,8 @@
 //! struct Graph { nodes: Vec<&'static str>, edges: Vec<(usize,usize)> }
 //!
 //! pub fn render_to<W: Write>(output: &mut W) {
-//! let nodes = vec!("{x,y}","{x}","{y}","{}");
-//! let edges = vec!((0,1), (0,2), (1,3), (2,3));
+//! let nodes = vec!["{x,y}","{x}","{y}","{}"];
+//! let edges = vec![(0,1), (0,2), (1,3), (2,3)];
 //! let graph = Graph { nodes: nodes, edges: edges };
 //!
 //! dot::render(&graph, output).unwrap()
@@ -226,8 +226,8 @@
 //! struct Graph { nodes: Vec<&'static str>, edges: Vec<(usize,usize)> }
 //!
 //! pub fn render_to<W: Write>(output: &mut W) {
-//! let nodes = vec!("{x,y}","{x}","{y}","{}");
-//! let edges = vec!((0,1), (0,2), (1,3), (2,3));
+//! let nodes = vec!["{x,y}","{x}","{y}","{}"];
+//! let edges = vec![(0,1), (0,2), (1,3), (2,3)];
 //! let graph = Graph { nodes: nodes, edges: edges };
 //!
 //! dot::render(&graph, output).unwrap()

src/librand/chacha.rs

@@ -253,17 +253,17 @@ mod tests {
 
  let v = (0..16).map(|_| ra.next_u32()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(0xade0b876, 0x903df1a0, 0xe56a5d40, 0x28bd8653,
+ vec![0xade0b876, 0x903df1a0, 0xe56a5d40, 0x28bd8653,
  0xb819d2bd, 0x1aed8da0, 0xccef36a8, 0xc70d778b,
  0x7c5941da, 0x8d485751, 0x3fe02477, 0x374ad8b8,
- 0xf4b8436a, 0x1ca11815, 0x69b687c3, 0x8665eeb2));
+ 0xf4b8436a, 0x1ca11815, 0x69b687c3, 0x8665eeb2]);
 
  let v = (0..16).map(|_| ra.next_u32()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(0xbee7079f, 0x7a385155, 0x7c97ba98, 0x0d082d73,
+ vec![0xbee7079f, 0x7a385155, 0x7c97ba98, 0x0d082d73,
  0xa0290fcb, 0x6965e348, 0x3e53c612, 0xed7aee32,
  0x7621b729, 0x434ee69c, 0xb03371d5, 0xd539d874,
- 0x281fed31, 0x45fb0a51, 0x1f0ae1ac, 0x6f4d794b));
+ 0x281fed31, 0x45fb0a51, 0x1f0ae1ac, 0x6f4d794b]);
 
 
  let seed: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
@@ -280,10 +280,10 @@ mod tests {
  }
 
  assert_eq!(v,
- vec!(0xf225c81a, 0x6ab1be57, 0x04d42951, 0x70858036,
+ vec![0xf225c81a, 0x6ab1be57, 0x04d42951, 0x70858036,
  0x49884684, 0x64efec72, 0x4be2d186, 0x3615b384,
  0x11cfa18e, 0xd3c50049, 0x75c775f6, 0x434c6530,
- 0x2c5bad8f, 0x898881dc, 0x5f1c86d9, 0xc1f8e7f4));
+ 0x2c5bad8f, 0x898881dc, 0x5f1c86d9, 0xc1f8e7f4]);
  }
 
  #[test]

src/librand/distributions/mod.rs

@@ -312,37 +312,37 @@ mod tests {
  }}
  }
 
- t!(vec!(Weighted { weight: 1, item: 10 }),
+ t!(vec![Weighted { weight: 1, item: 10 }],
  [10]);
 
  // skip some
- t!(vec!(Weighted { weight: 0, item: 20 },
+ t!(vec![Weighted { weight: 0, item: 20 },
  Weighted { weight: 2, item: 21 },
  Weighted { weight: 0, item: 22 },
- Weighted { weight: 1, item: 23 }),
+ Weighted { weight: 1, item: 23 }],
  [21, 21, 23]);
 
  // different weights
- t!(vec!(Weighted { weight: 4, item: 30 },
- Weighted { weight: 3, item: 31 }),
+ t!(vec![Weighted { weight: 4, item: 30 },
+ Weighted { weight: 3, item: 31 }],
  [30, 30, 30, 30, 31, 31, 31]);
 
  // check that we're binary searching
  // correctly with some vectors of odd
  // length.
- t!(vec!(Weighted { weight: 1, item: 40 },
+ t!(vec![Weighted { weight: 1, item: 40 },
  Weighted { weight: 1, item: 41 },
  Weighted { weight: 1, item: 42 },
  Weighted { weight: 1, item: 43 },
- Weighted { weight: 1, item: 44 }),
+ Weighted { weight: 1, item: 44 }],
  [40, 41, 42, 43, 44]);
- t!(vec!(Weighted { weight: 1, item: 50 },
+ t!(vec![Weighted { weight: 1, item: 50 },
  Weighted { weight: 1, item: 51 },
  Weighted { weight: 1, item: 52 },
  Weighted { weight: 1, item: 53 },
  Weighted { weight: 1, item: 54 },
  Weighted { weight: 1, item: 55 },
- Weighted { weight: 1, item: 56 }),
+ Weighted { weight: 1, item: 56 }],
  [50, 51, 52, 53, 54, 55, 56]);
  }
 

src/librand/isaac.rs

@@ -662,8 +662,8 @@ mod tests {
  // Regression test that isaac is actually using the above vector
  let v = (0..10).map(|_| ra.next_u32()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(2558573138, 873787463, 263499565, 2103644246, 3595684709,
- 4203127393, 264982119, 2765226902, 2737944514, 3900253796));
+ vec![2558573138, 873787463, 263499565, 2103644246, 3595684709,
+ 4203127393, 264982119, 2765226902, 2737944514, 3900253796]);
 
  let seed: &[_] = &[12345, 67890, 54321, 9876];
  let mut rb: IsaacRng = SeedableRng::from_seed(seed);
@@ -674,8 +674,8 @@ mod tests {
 
  let v = (0..10).map(|_| rb.next_u32()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(3676831399, 3183332890, 2834741178, 3854698763, 2717568474,
- 1576568959, 3507990155, 179069555, 141456972, 2478885421));
+ vec![3676831399, 3183332890, 2834741178, 3854698763, 2717568474,
+ 1576568959, 3507990155, 179069555, 141456972, 2478885421]);
  }
  #[test]
  #[rustfmt_skip]
@@ -685,10 +685,10 @@ mod tests {
  // Regression test that isaac is actually using the above vector
  let v = (0..10).map(|_| ra.next_u64()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(547121783600835980, 14377643087320773276, 17351601304698403469,
+ vec![547121783600835980, 14377643087320773276, 17351601304698403469,
  1238879483818134882, 11952566807690396487, 13970131091560099343,
  4469761996653280935, 15552757044682284409, 6860251611068737823,
- 13722198873481261842));
+ 13722198873481261842]);
 
  let seed: &[_] = &[12345, 67890, 54321, 9876];
  let mut rb: Isaac64Rng = SeedableRng::from_seed(seed);
@@ -699,10 +699,10 @@ mod tests {
 
  let v = (0..10).map(|_| rb.next_u64()).collect::<Vec<_>>();
  assert_eq!(v,
- vec!(18143823860592706164, 8491801882678285927, 2699425367717515619,
+ vec![18143823860592706164, 8491801882678285927, 2699425367717515619,
  17196852593171130876, 2606123525235546165, 15790932315217671084,
  596345674630742204, 9947027391921273664, 11788097613744130851,
- 10391409374914919106));
+ 10391409374914919106]);
 
  }
 

src/librustc/cfg/construct.rs

@@ -536,7 +536,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
  fn add_contained_edge(&mut self,
  source: CFGIndex,
  target: CFGIndex) {
- let data = CFGEdgeData {exiting_scopes: vec!() };
+ let data = CFGEdgeData {exiting_scopes: vec![] };
  self.graph.add_edge(source, target, data);
  }
 
@@ -545,7 +545,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
  from_index: CFGIndex,
  to_loop: LoopScope,
  to_index: CFGIndex) {
- let mut data = CFGEdgeData {exiting_scopes: vec!() };
+ let mut data = CFGEdgeData {exiting_scopes: vec![] };
  let mut scope = self.tcx.region_maps.node_extent(from_expr.id);
  let target_scope = self.tcx.region_maps.node_extent(to_loop.loop_id);
  while scope != target_scope {
@@ -559,7 +559,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
  _from_expr: &hir::Expr,
  from_index: CFGIndex) {
  let mut data = CFGEdgeData {
- exiting_scopes: vec!(),
+ exiting_scopes: vec![],
  };
  for &LoopScope { loop_id: id, .. } in self.loop_scopes.iter().rev() {
  data.exiting_scopes.push(id);

src/librustc/hir/lowering.rs

@@ -1218,7 +1218,7 @@ impl<'a> LoweringContext<'a> {
  alignstack,
  dialect,
  expn_id,
- }) => hir::ExprInlineAsm(hir::InlineAsm {
+ }) => hir::ExprInlineAsm(P(hir::InlineAsm {
  inputs: inputs.iter().map(|&(ref c, _)| c.clone()).collect(),
  outputs: outputs.iter()
  .map(|out| {
@@ -1236,7 +1236,7 @@ impl<'a> LoweringContext<'a> {
  alignstack: alignstack,
  dialect: dialect,
  expn_id: expn_id,
- }, outputs.iter().map(|out| self.lower_expr(&out.expr)).collect(),
+ }), outputs.iter().map(|out| self.lower_expr(&out.expr)).collect(),
  inputs.iter().map(|&(_, ref input)| self.lower_expr(input)).collect()),
  ExprKind::Struct(ref path, ref fields, ref maybe_expr) => {
  hir::ExprStruct(self.lower_path(path),

src/librustc/hir/mod.rs

@@ -940,7 +940,7 @@ pub enum Expr_ {
  ExprRet(Option<P<Expr>>),
 
  /// Inline assembly (from `asm!`), with its outputs and inputs.
- ExprInlineAsm(InlineAsm, Vec<P<Expr>>, Vec<P<Expr>>),
+ ExprInlineAsm(P<InlineAsm>, HirVec<P<Expr>>, HirVec<P<Expr>>),
 
  /// A struct or struct-like variant literal expression.
  ///

src/librustc/infer/error_reporting.rs

@@ -457,7 +457,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
  }
  same_regions.push(SameRegions {
  scope_id: scope_id,
- regions: vec!(sub_fr.bound_region, sup_fr.bound_region)
+ regions: vec![sub_fr.bound_region, sup_fr.bound_region]
  })
  }
  }
@@ -1359,7 +1359,7 @@ impl<'a, 'gcx, 'tcx> Rebuilder<'a, 'gcx, 'tcx> {
  region_names: &HashSet<ast::Name>)
  -> P<hir::Ty> {
  let mut new_ty = P(ty.clone());
- let mut ty_queue = vec!(ty);
+ let mut ty_queue = vec![ty];
  while !ty_queue.is_empty() {
  let cur_ty = ty_queue.remove(0);
  match cur_ty.node {

src/librustc/lib.rs

@@ -111,8 +111,6 @@ pub mod traits;
 pub mod ty;
 
 pub mod util {
- pub use rustc_back::sha2;
-
  pub mod common;
  pub mod ppaux;
  pub mod nodemap;

src/librustc/lint/context.rs

@@ -127,9 +127,9 @@ impl LintStore {
 
  pub fn new() -> LintStore {
  LintStore {
- lints: vec!(),
- early_passes: Some(vec!()),
- late_passes: Some(vec!()),
+ lints: vec![],
+ early_passes: Some(vec![]),
+ late_passes: Some(vec![]),
  by_name: FnvHashMap(),
  levels: FnvHashMap(),
  future_incompatible: FnvHashMap(),
@@ -345,7 +345,7 @@ macro_rules! run_lints { ($cx:expr, $f:ident, $ps:ident, $($args:expr),*) => ({
 // See also the hir version just below.
 pub fn gather_attrs(attrs: &[ast::Attribute])
  -> Vec<Result<(InternedString, Level, Span), Span>> {
- let mut out = vec!();
+ let mut out = vec![];
  for attr in attrs {
  let r = gather_attr(attr);
  out.extend(r.into_iter());
@@ -355,7 +355,7 @@ pub fn gather_attrs(attrs: &[ast::Attribute])
 
 pub fn gather_attr(attr: &ast::Attribute)
  -> Vec<Result<(InternedString, Level, Span), Span>> {
- let mut out = vec!();
+ let mut out = vec![];
 
  let level = match Level::from_str(&attr.name()) {
  None => return out,

src/librustc/middle/lang_items.rs

@@ -59,7 +59,7 @@ impl LanguageItems {
  fn foo(_: LangItem) -> Option<DefId> { None }
 
  LanguageItems {
- items: vec!($(foo($variant)),*),
+ items: vec![$(foo($variant)),*],
  missing: Vec::new(),
  }
  }