bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23919: alexcrichton/stabilize-io-error

Browse source 
Conflicts:
	src/libstd/fs/tempdir.rs
	src/libstd/io/error.rs
This commit is contained in:
Alex Crichton 2015-03-31 16:18:55 -07:00
commit 50b3ecf3bc
22 changed files with 108 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstd/io/mod.rs
View file

@ -83,7 +83,7 @@ fn append_to_string<F>(buf: &mut String, f: F) -> Result<usize>
if str::from_utf8(&g.s[g.len..]).is_err() {
ret.and_then(|_| {
Err(Error::new(ErrorKind::InvalidInput,
"stream did not contain valid UTF-8", None))
"stream did not contain valid UTF-8"))
})
} else {
g.len = g.s.len();
@ -359,8 +359,7 @@ pub trait Write {
while buf.len() > 0 {
match self.write(buf) {
Ok(0) => return Err(Error::new(ErrorKind::WriteZero,
"failed to write whole buffer",
None)),
"failed to write whole buffer")),
Ok(n) => buf = &buf[n..],
Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
Err(e) => return Err(e),
@ -782,7 +781,7 @@ pub struct Chars<R> {
/// An enumeration of possible errors that can be generated from the `Chars`
/// adapter.
#[derive(PartialEq, Clone, Debug)]
#[derive(Debug)]
#[unstable(feature = "io", reason = "awaiting stability of Read::chars")]
pub enum CharsError {
/// Variant representing that the underlying stream was read successfully