0dfa9978cc
The new `io` module has had some time to bake and this commit stabilizes some of the utilities associated with it. This commit also deprecates a number of `std::old_io::util` functions and structures. These items are now `#[stable]` * `Cursor` * `Cursor::{new, into_inner, get_ref, get_mut, position, set_position}` * Implementations of I/O traits for `Cursor<T>` * Delegating implementations of I/O traits for references and `Box` pointers * Implementations of I/O traits for primitives like slices and `Vec<T>` * `ReadExt::bytes` * `Bytes` (and impls) * `ReadExt::chain` * `Chain` (and impls) * `ReadExt::take` (and impls) * `BufReadExt::lines` * `Lines` (and impls) * `io::copy` * `io::{empty, Empty}` (and impls) * `io::{sink, Sink}` (and impls) * `io::{repeat, Repeat}` (and impls) These items remain `#[unstable]` * Core I/O traits. These may want a little bit more time to bake along with the commonly used methods like `read_to_end`. * `BufReadExt::split` - this function may be renamed to not conflict with `SliceExt::split`. * `Error` - there are a number of questions about its representation, `ErrorKind`, and usability. These items are now `#[deprecated]` in `old_io` * `LimitReader` - use `take` instead * `NullWriter` - use `io::sink` instead * `ZeroReader` - use `io::repeat` instead * `NullReader` - use `io::empty` instead * `MultiWriter` - use `broadcast` instead * `ChainedReader` - use `chain` instead * `TeeReader` - use `tee` instead * `copy` - use `io::copy` instead [breaking-change]
169 lines
5.2 KiB
Rust
169 lines
5.2 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![allow(missing_copy_implementations)]
|
|
|
|
use prelude::v1::*;
|
|
|
|
use io::{self, Read, Write, ErrorKind, BufRead};
|
|
|
|
/// Copies the entire contents of a reader into a writer.
|
|
///
|
|
/// This function will continuously read data from `r` and then write it into
|
|
/// `w` in a streaming fashion until `r` returns EOF.
|
|
///
|
|
/// On success the total number of bytes that were copied from `r` to `w` is
|
|
/// returned.
|
|
///
|
|
/// # Errors
|
|
///
|
|
/// This function will return an error immediately if any call to `read` or
|
|
/// `write` returns an error. All instances of `ErrorKind::Interrupted` are
|
|
/// handled by this function and the underlying operation is retried.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub fn copy<R: Read, W: Write>(r: &mut R, w: &mut W) -> io::Result<u64> {
|
|
let mut buf = [0; super::DEFAULT_BUF_SIZE];
|
|
let mut written = 0;
|
|
loop {
|
|
let len = match r.read(&mut buf) {
|
|
Ok(0) => return Ok(written),
|
|
Ok(len) => len,
|
|
Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
|
|
Err(e) => return Err(e),
|
|
};
|
|
try!(w.write_all(&buf[..len]));
|
|
written += len as u64;
|
|
}
|
|
}
|
|
|
|
/// A reader which is always at EOF.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub struct Empty { _priv: () }
|
|
|
|
/// Creates an instance of an empty reader.
|
|
///
|
|
/// All reads from the returned reader will return `Ok(0)`.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub fn empty() -> Empty { Empty { _priv: () } }
|
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
impl Read for Empty {
|
|
fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> { Ok(0) }
|
|
}
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
impl BufRead for Empty {
|
|
fn fill_buf(&mut self) -> io::Result<&[u8]> { Ok(&[]) }
|
|
fn consume(&mut self, _n: usize) {}
|
|
}
|
|
|
|
/// A reader which infinitely yields one byte.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub struct Repeat { byte: u8 }
|
|
|
|
/// Creates an instance of a reader that infinitely repeats one byte.
|
|
///
|
|
/// All reads from this reader will succeed by filling the specified buffer with
|
|
/// the given byte.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub fn repeat(byte: u8) -> Repeat { Repeat { byte: byte } }
|
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
impl Read for Repeat {
|
|
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
|
for slot in buf.iter_mut() {
|
|
*slot = self.byte;
|
|
}
|
|
Ok(buf.len())
|
|
}
|
|
}
|
|
|
|
/// A writer which will move data into the void.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub struct Sink { _priv: () }
|
|
|
|
/// Creates an instance of a writer which will successfully consume all data.
|
|
///
|
|
/// All calls to `write` on the returned instance will return `Ok(buf.len())`
|
|
/// and the contents of the buffer will not be inspected.
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
pub fn sink() -> Sink { Sink { _priv: () } }
|
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
impl Write for Sink {
|
|
fn write(&mut self, buf: &[u8]) -> io::Result<usize> { Ok(buf.len()) }
|
|
fn flush(&mut self) -> io::Result<()> { Ok(()) }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use prelude::v1::*;
|
|
|
|
use io::prelude::*;
|
|
use io::{sink, empty, repeat};
|
|
|
|
#[test]
|
|
fn sink_sinks() {
|
|
let mut s = sink();
|
|
assert_eq!(s.write(&[]), Ok(0));
|
|
assert_eq!(s.write(&[0]), Ok(1));
|
|
assert_eq!(s.write(&[0; 1024]), Ok(1024));
|
|
assert_eq!(s.by_ref().write(&[0; 1024]), Ok(1024));
|
|
}
|
|
|
|
#[test]
|
|
fn empty_reads() {
|
|
let mut e = empty();
|
|
assert_eq!(e.read(&mut []), Ok(0));
|
|
assert_eq!(e.read(&mut [0]), Ok(0));
|
|
assert_eq!(e.read(&mut [0; 1024]), Ok(0));
|
|
assert_eq!(e.by_ref().read(&mut [0; 1024]), Ok(0));
|
|
}
|
|
|
|
#[test]
|
|
fn repeat_repeats() {
|
|
let mut r = repeat(4);
|
|
let mut b = [0; 1024];
|
|
assert_eq!(r.read(&mut b), Ok(1024));
|
|
assert!(b.iter().all(|b| *b == 4));
|
|
}
|
|
|
|
#[test]
|
|
fn take_some_bytes() {
|
|
assert_eq!(repeat(4).take(100).bytes().count(), 100);
|
|
assert_eq!(repeat(4).take(100).bytes().next(), Some(Ok(4)));
|
|
assert_eq!(repeat(1).take(10).chain(repeat(2).take(10)).bytes().count(), 20);
|
|
}
|
|
|
|
#[test]
|
|
fn tee() {
|
|
let mut buf = [0; 10];
|
|
{
|
|
let mut ptr: &mut [u8] = &mut buf;
|
|
assert_eq!(repeat(4).tee(&mut ptr).take(5).read(&mut [0; 10]), Ok(5));
|
|
}
|
|
assert_eq!(buf, [4, 4, 4, 4, 4, 0, 0, 0, 0, 0]);
|
|
}
|
|
|
|
#[test]
|
|
fn broadcast() {
|
|
let mut buf1 = [0; 10];
|
|
let mut buf2 = [0; 10];
|
|
{
|
|
let mut ptr1: &mut [u8] = &mut buf1;
|
|
let mut ptr2: &mut [u8] = &mut buf2;
|
|
|
|
assert_eq!((&mut ptr1).broadcast(&mut ptr2)
|
|
.write(&[1, 2, 3]), Ok(3));
|
|
}
|
|
assert_eq!(buf1, buf2);
|
|
assert_eq!(buf1, [1, 2, 3, 0, 0, 0, 0, 0, 0, 0]);
|
|
}
|
|
}
|