diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2014-03-08 18:11:52 -0500 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2014-03-20 01:30:27 -0400 |
| commit | ce620320a20baa1428e679c751b1b4a8d8556ca1 (patch) | |
| tree | f28a0234fe5f1d9509ef6cfa0c92448f7f29f7ec /src/libterm/terminfo | |
| parent | 4ca51aeea7187a63b987129d67cf7d348b6c60a9 (diff) | |
| download | rust-ce620320a20baa1428e679c751b1b4a8d8556ca1.tar.gz rust-ce620320a20baa1428e679c751b1b4a8d8556ca1.zip | |
rename std::vec -> std::slice
Closes #12702
Diffstat (limited to 'src/libterm/terminfo')
| -rw-r--r-- | src/libterm/terminfo/parm.rs | 8 | ||||
| -rw-r--r-- | src/libterm/terminfo/parser/compiled.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index dfb6d6b1a88..ee14b90fbfd 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -10,7 +10,7 @@ //! Parameterized string expansion -use std::{char, vec}; +use std::{char, slice}; use std::mem::replace; #[deriving(Eq)] @@ -93,7 +93,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) let mut state = Nothing; // expanded cap will only rarely be larger than the cap itself - let mut output = vec::with_capacity(cap.len()); + let mut output = slice::with_capacity(cap.len()); let mut stack: ~[Param] = ~[]; @@ -488,7 +488,7 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result<~[u8],~str> { (FormatString, _) => return Err(~"non-number on stack with %s"), }; if flags.precision > s.len() { - let mut s_ = vec::with_capacity(flags.precision); + let mut s_ = slice::with_capacity(flags.precision); let n = flags.precision - s.len(); s_.grow(n, &('0' as u8)); s_.push_all_move(s); @@ -543,7 +543,7 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result<~[u8],~str> { if flags.left { s.grow(n, &(' ' as u8)); } else { - let mut s_ = vec::with_capacity(flags.width); + let mut s_ = slice::with_capacity(flags.width); s_.grow(n, &(' ' as u8)); s_.push_all_move(s); s = s_; diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs index 8ba3ad53121..cc97e54709c 100644 --- a/src/libterm/terminfo/parser/compiled.rs +++ b/src/libterm/terminfo/parser/compiled.rs @@ -13,7 +13,7 @@ /// ncurses-compatible compiled terminfo format parsing (term(5)) -use std::{vec, str}; +use std::{slice, str}; use std::io; use collections::HashMap; use super::super::TermInfo; @@ -246,7 +246,7 @@ pub fn parse(file: &mut io::Reader, let mut string_map = HashMap::new(); if string_offsets_count != 0 { - let mut string_offsets = vec::with_capacity(10); + let mut string_offsets = slice::with_capacity(10); for _ in range(0, string_offsets_count) { string_offsets.push(try!(file.read_le_u16())); } |
