about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-03-08 18:11:52 -0500
committerDaniel Micay <danielmicay@gmail.com>2014-03-20 01:30:27 -0400
commitce620320a20baa1428e679c751b1b4a8d8556ca1 (patch)
treef28a0234fe5f1d9509ef6cfa0c92448f7f29f7ec /src/libserialize
parent4ca51aeea7187a63b987129d67cf7d348b6c60a9 (diff)
downloadrust-ce620320a20baa1428e679c751b1b4a8d8556ca1.tar.gz
rust-ce620320a20baa1428e679c751b1b4a8d8556ca1.zip
rename std::vec -> std::slice
Closes #12702
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/base64.rs4
-rw-r--r--src/libserialize/ebml.rs16
-rw-r--r--src/libserialize/hex.rs6
-rw-r--r--src/libserialize/serialize.rs6
4 files changed, 16 insertions, 16 deletions
diff --git a/src/libserialize/base64.rs b/src/libserialize/base64.rs
index a09b03ec58a..62e078e26c1 100644
--- a/src/libserialize/base64.rs
+++ b/src/libserialize/base64.rs
@@ -337,11 +337,11 @@ mod tests {
     #[test]
     fn test_base64_random() {
         use self::rand::{task_rng, random, Rng};
-        use std::vec;
+        use std::slice;
 
         for _ in range(0, 1000) {
             let times = task_rng().gen_range(1u, 100);
-            let v = vec::from_fn(times, |_| random::<u8>());
+            let v = slice::from_fn(times, |_| random::<u8>());
             assert_eq!(v.to_base64(STANDARD).from_base64().unwrap(), v);
         }
     }
diff --git a/src/libserialize/ebml.rs b/src/libserialize/ebml.rs
index bc9eee51753..2b416f263c2 100644
--- a/src/libserialize/ebml.rs
+++ b/src/libserialize/ebml.rs
@@ -1041,8 +1041,8 @@ mod bench {
 
     #[bench]
     pub fn vuint_at_A_aligned(bh: &mut BenchHarness) {
-        use std::vec;
-        let data = vec::from_fn(4*100, |i| {
+        use std::slice;
+        let data = slice::from_fn(4*100, |i| {
             match i % 2 {
               0 => 0x80u8,
               _ => i as u8,
@@ -1060,8 +1060,8 @@ mod bench {
 
     #[bench]
     pub fn vuint_at_A_unaligned(bh: &mut BenchHarness) {
-        use std::vec;
-        let data = vec::from_fn(4*100+1, |i| {
+        use std::slice;
+        let data = slice::from_fn(4*100+1, |i| {
             match i % 2 {
               1 => 0x80u8,
               _ => i as u8
@@ -1079,8 +1079,8 @@ mod bench {
 
     #[bench]
     pub fn vuint_at_D_aligned(bh: &mut BenchHarness) {
-        use std::vec;
-        let data = vec::from_fn(4*100, |i| {
+        use std::slice;
+        let data = slice::from_fn(4*100, |i| {
             match i % 4 {
               0 => 0x10u8,
               3 => i as u8,
@@ -1099,8 +1099,8 @@ mod bench {
 
     #[bench]
     pub fn vuint_at_D_unaligned(bh: &mut BenchHarness) {
-        use std::vec;
-        let data = vec::from_fn(4*100+1, |i| {
+        use std::slice;
+        let data = slice::from_fn(4*100+1, |i| {
             match i % 4 {
               1 => 0x10u8,
               0 => i as u8,
diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs
index 5ec70773c3f..a95c77c7c13 100644
--- a/src/libserialize/hex.rs
+++ b/src/libserialize/hex.rs
@@ -10,7 +10,7 @@
 
 //! Hex binary-to-text encoding
 use std::str;
-use std::vec;
+use std::slice;
 use std::fmt;
 
 /// A trait for converting a value to hexadecimal encoding
@@ -39,7 +39,7 @@ impl<'a> ToHex for &'a [u8] {
      * ```
      */
     fn to_hex(&self) -> ~str {
-        let mut v = vec::with_capacity(self.len() * 2);
+        let mut v = slice::with_capacity(self.len() * 2);
         for &byte in self.iter() {
             v.push(CHARS[byte >> 4]);
             v.push(CHARS[byte & 0xf]);
@@ -106,7 +106,7 @@ impl<'a> FromHex for &'a str {
      */
     fn from_hex(&self) -> Result<~[u8], FromHexError> {
         // This may be an overestimate if there is any whitespace
-        let mut b = vec::with_capacity(self.len() / 2);
+        let mut b = slice::with_capacity(self.len() / 2);
         let mut modulus = 0;
         let mut buf = 0u8;
 
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
index fd57f47e881..a103d0f4964 100644
--- a/src/libserialize/serialize.rs
+++ b/src/libserialize/serialize.rs
@@ -16,7 +16,7 @@ Core encoding and decoding interfaces.
 
 use std::path;
 use std::rc::Rc;
-use std::vec;
+use std::slice;
 use std::vec_ng::Vec;
 
 pub trait Encoder {
@@ -428,7 +428,7 @@ impl<S:Encoder,T:Encodable<S>> Encodable<S> for ~[T] {
 impl<D:Decoder,T:Decodable<D>> Decodable<D> for ~[T] {
     fn decode(d: &mut D) -> ~[T] {
         d.read_seq(|d, len| {
-            vec::from_fn(len, |i| {
+            slice::from_fn(len, |i| {
                 d.read_seq_elt(i, |d| Decodable::decode(d))
             })
         })
@@ -680,7 +680,7 @@ pub trait DecoderHelpers {
 impl<D:Decoder> DecoderHelpers for D {
     fn read_to_vec<T>(&mut self, f: |&mut D| -> T) -> ~[T] {
         self.read_seq(|this, len| {
-            vec::from_fn(len, |i| {
+            slice::from_fn(len, |i| {
                 this.read_seq_elt(i, |this| f(this))
             })
         })