Remove usage of the collections feature

Byron · Mar 9, 2015 · 931360f · 931360f
1 parent 04555a3
commit 931360f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/deflate.rs b/src/deflate.rs
@@ -158,7 +158,7 @@ mod tests {
         let v = thread_rng().gen_iter::<u8>().take(1024).collect::<Vec<_>>();
         for _ in 0..200 {
             let to_write = &v[..thread_rng().gen_range(0, v.len())];
-            real.push_all(to_write);
+            real.extend(to_write.iter().map(|x| *x));
             w.write_all(to_write).unwrap();
         }
         let result = w.finish().unwrap();

diff --git a/src/gz.rs b/src/gz.rs
@@ -143,21 +143,21 @@ impl Builder {
                 flg |= FEXTRA;
                 header.push((v.len() >> 0) as u8);
                 header.push((v.len() >> 8) as u8);
-                header.push_all(&v);
+                header.extend(v);
             }
             None => {}
         }
         match filename {
             Some(filename) => {
                 flg |= FNAME;
-                header.push_all(filename.as_bytes_with_nul());
+                header.extend(filename.as_bytes_with_nul().iter().map(|x| *x));
             }
             None => {}
         }
         match comment {
             Some(comment) => {
                 flg |= FCOMMENT;
-                header.push_all(comment.as_bytes_with_nul());
+                header.extend(comment.as_bytes_with_nul().iter().map(|x| *x));
             }
             None => {}
         }
@@ -497,7 +497,7 @@ mod tests {
         let v = thread_rng().gen_iter::<u8>().take(1024).collect::<Vec<_>>();
         for _ in 0..200 {
             let to_write = &v[..thread_rng().gen_range(0, v.len())];
-            real.push_all(to_write);
+            real.extend(to_write.iter().map(|x| *x));
             w.write_all(to_write).unwrap();
         }
         let result = w.finish().unwrap();

diff --git a/src/lib.rs b/src/lib.rs
@@ -25,7 +25,7 @@
 //! already existing stream to chain construction.
 
 #![doc(html_root_url = "http://alexcrichton.com/flate2-rs")]
-#![feature(io, collections)]
+#![feature(io)]
 #![deny(missing_docs)]
 #![feature(unsafe_destructor)]
 #![cfg_attr(test, deny(warnings))]

diff --git a/src/raw.rs b/src/raw.rs
@@ -23,7 +23,7 @@ pub struct DecoderReader<R: Read>(InnerRead<R, Decompress>);
 struct InnerRead<R, D: Direction> {
     inner: R,
     stream: Stream<D>,
-    buf: Box<[u8]>,
+    buf: Vec<u8>, // TODO: this should be Box<[u8]>
     pos: usize,
     cap: usize,
 }
@@ -161,7 +161,7 @@ impl<R: Read> EncoderReader<R> {
         EncoderReader(InnerRead {
             inner: w,
             stream: Stream::new_compress(level, raw),
-            buf: buf.into_boxed_slice(),
+            buf: buf,
             cap: 0,
             pos: 0,
         })
@@ -181,7 +181,7 @@ impl<R: Read> DecoderReader<R> {
         DecoderReader(InnerRead {
             inner: r,
             stream: Stream::new_decompress(raw),
-            buf: buf.into_boxed_slice(),
+            buf: buf,
             pos: 0,
             cap: 0,
         })

diff --git a/src/zlib.rs b/src/zlib.rs
@@ -158,7 +158,7 @@ mod tests {
         let v = thread_rng().gen_iter::<u8>().take(1024).collect::<Vec<_>>();
         for _ in 0..200 {
             let to_write = &v[..thread_rng().gen_range(0, v.len())];
-            real.push_all(to_write);
+            real.extend(to_write.iter().map(|x| *x));
             w.write_all(to_write).unwrap();
         }
         let result = w.finish().unwrap();