diff options
| author | bors <bors@rust-lang.org> | 2014-04-18 11:41:23 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-18 11:41:23 -0700 |
| commit | d1d8497e53af86687e701eea0fe2a41b0c4313eb (patch) | |
| tree | ac2ffc0405647555976c3b6b90e98a4e9398eb11 /src/libsyntax | |
| parent | ce2bab68d69ee04e17c0165dbdb7b583d5a7c991 (diff) | |
| parent | 675b82657e7d9fd4c824ff3c6dbead1edd1ab515 (diff) | |
| download | rust-d1d8497e53af86687e701eea0fe2a41b0c4313eb.tar.gz rust-d1d8497e53af86687e701eea0fe2a41b0c4313eb.zip | |
auto merge of #13588 : alexcrichton/rust/no-more-growing, r=thestinger
This is all in preparation for DST. This removes all the growable/shrinkable methods from `~[T]`.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/format.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 86c7ae28ac2..84021f6362b 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -20,7 +20,6 @@ use rsparse = parse; use std::fmt::parse; use collections::{HashMap, HashSet}; -use std::slice; #[deriving(Eq)] enum ArgumentType { @@ -609,7 +608,7 @@ impl<'a, 'b> Context<'a, 'b> { fn to_expr(&self, extra: @ast::Expr) -> @ast::Expr { let mut lets = Vec::new(); let mut locals = Vec::new(); - let mut names = slice::from_fn(self.name_positions.len(), |_| None); + let mut names = Vec::from_fn(self.name_positions.len(), |_| None); let mut pats = Vec::new(); let mut heads = Vec::new(); @@ -673,7 +672,7 @@ impl<'a, 'b> Context<'a, 'b> { let lname = self.ecx.ident_of(format!("__arg{}", *name)); pats.push(self.ecx.pat_ident(e.span, lname)); heads.push(self.ecx.expr_addr_of(e.span, e)); - names[*self.name_positions.get(name)] = + *names.get_mut(*self.name_positions.get(name)) = Some(self.format_arg(e.span, Named((*name).clone()), self.ecx.expr_ident(e.span, lname))); |
