rename std::vec -> std::slice

Closes #12702
This commit is contained in:
Daniel Micay 2014-03-08 18:11:52 -05:00
parent 4ca51aeea7
commit ce620320a2
115 changed files with 360 additions and 365 deletions

View file

@ -16,7 +16,7 @@ use collections::{TrieMap, TreeMap, HashMap, HashSet};
use std::os;
use rand::{Rng, IsaacRng, SeedableRng};
use std::uint;
use std::vec;
use std::slice;
fn timed(label: &str, f: ||) {
let start = time::precise_time_s();
@ -99,7 +99,7 @@ fn main() {
}
};
let mut rand = vec::with_capacity(n_keys);
let mut rand = slice::with_capacity(n_keys);
{
let mut rng: IsaacRng = SeedableRng::from_seed(&[1, 1, 1, 1, 1, 1, 1]);

View file

@ -20,7 +20,7 @@ use rand::Rng;
use std::mem::swap;
use std::os;
use std::str;
use std::vec;
use std::slice;
use std::io::File;
macro_rules! bench (
@ -61,7 +61,7 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: ||) {
}
fn shift_push() {
let mut v1 = vec::from_elem(30000, 1);
let mut v1 = slice::from_elem(30000, 1);
let mut v2 = ~[];
while v1.len() > 0 {
@ -88,7 +88,7 @@ fn vec_plus() {
let mut v = ~[];
let mut i = 0;
while i < 1500 {
let rv = vec::from_elem(r.gen_range(0u, i + 1), i);
let rv = slice::from_elem(r.gen_range(0u, i + 1), i);
if r.gen() {
v.push_all_move(rv);
} else {
@ -104,12 +104,12 @@ fn vec_append() {
let mut v = ~[];
let mut i = 0;
while i < 1500 {
let rv = vec::from_elem(r.gen_range(0u, i + 1), i);
let rv = slice::from_elem(r.gen_range(0u, i + 1), i);
if r.gen() {
v = vec::append(v, rv);
v = slice::append(v, rv);
}
else {
v = vec::append(rv, v);
v = slice::append(rv, v);
}
i += 1;
}
@ -120,7 +120,7 @@ fn vec_push_all() {
let mut v = ~[];
for i in range(0u, 1500) {
let mut rv = vec::from_elem(r.gen_range(0u, i + 1), i);
let mut rv = slice::from_elem(r.gen_range(0u, i + 1), i);
if r.gen() {
v.push_all(rv);
}

View file

@ -9,7 +9,7 @@
// except according to those terms.
use std::os;
use std::vec;
use std::slice;
fn max(a: i32, b: i32) -> i32 {
if a > b {
@ -20,9 +20,9 @@ fn max(a: i32, b: i32) -> i32 {
}
fn fannkuch_redux(n: i32) -> i32 {
let mut perm = vec::from_elem(n as uint, 0i32);
let mut perm1 = vec::from_fn(n as uint, |i| i as i32);
let mut count = vec::from_elem(n as uint, 0i32);
let mut perm = slice::from_elem(n as uint, 0i32);
let mut perm1 = slice::from_fn(n as uint, |i| i as i32);
let mut count = slice::from_elem(n as uint, 0i32);
let mut max_flips_count = 0i32;
let mut perm_count = 0i32;
let mut checksum = 0i32;

View file

@ -11,8 +11,8 @@
use std::cmp::min;
use std::io::{stdout, IoResult};
use std::os;
use std::vec::bytes::copy_memory;
use std::vec;
use std::slice::bytes::copy_memory;
use std::slice;
static LINE_LEN: uint = 60;
static LOOKUP_SIZE: uint = 4 * 1024;
@ -89,7 +89,7 @@ impl<'a, W: Writer> RepeatFasta<'a, W> {
fn make(&mut self, n: uint) -> IoResult<()> {
let alu_len = self.alu.len();
let mut buf = vec::from_elem(alu_len + LINE_LEN, 0u8);
let mut buf = slice::from_elem(alu_len + LINE_LEN, 0u8);
let alu: &[u8] = self.alu.as_bytes();
copy_memory(buf, alu);

View file

@ -24,7 +24,7 @@ use std::os;
use std::io;
use std::str;
use std::task;
use std::vec;
use std::slice;
fn f64_cmp(x: f64, y: f64) -> Ordering {
// arbitrarily decide that NaNs are larger than everything.
@ -157,7 +157,7 @@ fn main() {
// initialize each sequence sorter
let sizes = ~[1u,2,3,4,6,12,18];
let mut streams = vec::from_fn(sizes.len(), |_| Some(channel::<~str>()));
let mut streams = slice::from_fn(sizes.len(), |_| Some(channel::<~str>()));
let mut from_child = ~[];
let to_child = sizes.iter().zip(streams.mut_iter()).map(|(sz, stream_ref)| {
let sz = *sz;

View file

@ -11,7 +11,7 @@
// ignore-pretty
use std::str;
use std::vec;
use std::slice;
static TABLE: [u8, ..4] = [ 'A' as u8, 'C' as u8, 'G' as u8, 'T' as u8 ];
static TABLE_SIZE: uint = 2 << 16;
@ -97,14 +97,14 @@ struct Table {
struct Items<'a> {
cur: Option<&'a Entry>,
items: vec::Items<'a, Option<~Entry>>,
items: slice::Items<'a, Option<~Entry>>,
}
impl Table {
fn new() -> Table {
Table {
count: 0,
items: vec::from_fn(TABLE_SIZE, |_| None),
items: slice::from_fn(TABLE_SIZE, |_| None),
}
}

View file

@ -180,7 +180,7 @@ fn get_id(m: u64) -> u8 {
// Converts a list of mask to a ~str.
fn to_utf8(raw_sol: &List<u64>) -> ~str {
let mut sol: ~[u8] = std::vec::from_elem(50, '.' as u8);
let mut sol: ~[u8] = std::slice::from_elem(50, '.' as u8);
for &m in raw_sol.iter() {
let id = get_id(m);
for i in range(0, 50) {

View file

@ -14,7 +14,7 @@ use std::from_str::FromStr;
use std::iter::count;
use std::cmp::min;
use std::os;
use std::vec::from_elem;
use std::slice::from_elem;
use sync::RWArc;
fn A(i: uint, j: uint) -> f64 {

View file

@ -17,7 +17,7 @@ use std::io::stdio::StdReader;
use std::io::BufferedReader;
use std::os;
use std::intrinsics::cttz16;
use std::vec;
use std::slice;
// Computes a single solution to a given 9x9 sudoku
//
@ -48,8 +48,8 @@ impl Sudoku {
}
pub fn from_vec(vec: &[[u8, ..9], ..9]) -> Sudoku {
let g = vec::from_fn(9u, |i| {
vec::from_fn(9u, |j| { vec[i][j] })
let g = slice::from_fn(9u, |i| {
slice::from_fn(9u, |j| { vec[i][j] })
});
return Sudoku::new(g)
}
@ -68,7 +68,7 @@ impl Sudoku {
pub fn read(mut reader: BufferedReader<StdReader>) -> Sudoku {
assert!(reader.read_line().unwrap() == ~"9,9"); /* assert first line is exactly "9,9" */
let mut g = vec::from_fn(10u, { |_i| ~[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8] });
let mut g = slice::from_fn(10u, { |_i| ~[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8] });
for line in reader.lines() {
let comps: ~[&str] = line.unwrap().trim().split(',').collect();

View file

@ -15,11 +15,11 @@
use std::os;
use std::task;
use std::uint;
use std::vec;
use std::slice;
fn calc(children: uint, parent_wait_chan: &Sender<Sender<Sender<int>>>) {
let wait_ports: ~[Receiver<Sender<Sender<int>>>] = vec::from_fn(children, |_| {
let wait_ports: ~[Receiver<Sender<Sender<int>>>] = slice::from_fn(children, |_| {
let (wait_port, wait_chan) = stream::<Sender<Sender<int>>>();
task::spawn(proc() {
calc(children / 2, &wait_chan);

View file

@ -13,5 +13,5 @@
fn main() {
~[1]; //~ ERROR use of deprecated `~[]`
//~^ ERROR use of deprecated `~[]`
std::vec::with_capacity::<int>(10); //~ ERROR use of deprecated `~[]`
std::slice::with_capacity::<int>(10); //~ ERROR use of deprecated `~[]`
}

View file

@ -29,7 +29,7 @@ use test::B;
// Make sure this import is warned about when at least one of its imported names
// is unused
use std::vec::{from_fn, from_elem}; //~ ERROR unused import
use std::slice::{from_fn, from_elem}; //~ ERROR unused import
mod test {
pub trait A { fn a(&self) {} }

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::vec;
use std::slice;
fn main() {
let a: ~[int] = ~[];

View file

@ -13,7 +13,7 @@
#[feature(globs)];
#[allow(dead_assignment)];
use std::vec::*;
use std::slice::*;
pub fn main() {
let mut v = from_elem(0u, 0);

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::vec;
use std::slice;
trait methods {
fn to_bytes(&self) -> ~[u8];
@ -16,14 +16,14 @@ trait methods {
impl methods for () {
fn to_bytes(&self) -> ~[u8] {
vec::from_elem(0, 0u8)
slice::from_elem(0, 0u8)
}
}
// the position of this function is significant! - if it comes before methods
// then it works, if it comes after it then it doesn't!
fn to_bools(bitv: Storage) -> ~[bool] {
vec::from_fn(8, |i| {
slice::from_fn(8, |i| {
let w = i / 64;
let b = i % 64;
let x = 1u64 & (bitv.storage[w] >> b);

View file

@ -20,7 +20,7 @@
// Extern mod controls linkage. Use controls the visibility of names to modules that are
// already linked in. Using WriterUtil allows us to use the write_line method.
use std::str;
use std::vec;
use std::slice;
use std::fmt;
// Represents a position on a canvas.
@ -62,8 +62,8 @@ impl Drop for AsciiArt {
fn AsciiArt(width: uint, height: uint, fill: char) -> AsciiArt {
// Use an anonymous function to build a vector of vectors containing
// blank characters for each position in our canvas.
let lines = vec::build(Some(height), |push| {
for _ in range(0, height) { push(vec::from_elem(width, '.')); }
let lines = slice::build(Some(height), |push| {
for _ in range(0, height) { push(slice::from_elem(width, '.')); }
});
// Rust code often returns values by omitting the trailing semi-colon

View file

@ -17,8 +17,8 @@
// begin failing.
mod m {
use std::vec;
pub fn f() -> ~[int] { vec::from_elem(1u, 0) }
use std::slice;
pub fn f() -> ~[int] { slice::from_elem(1u, 0) }
}
pub fn main() { let _x = m::f(); }

View file

@ -10,7 +10,6 @@
// Test the uninit() construct returning various empty types.
use std::vec;
use std::mem;
#[deriving(Clone)]