1
Fork 0

rollup merge of #24377: apasel422/docs

Conflicts:
	src/libstd/net/ip.rs
	src/libstd/sys/unix/fs.rs
	src/libstd/sys/unix/mod.rs
	src/libstd/sys/windows/mod.rs
This commit is contained in:
Alex Crichton 2015-04-14 10:56:57 -07:00
commit ae7959d298
63 changed files with 377 additions and 377 deletions

View file

@ -217,14 +217,14 @@ pub trait Read {
append_to_string(buf, |b| read_to_end(self, b))
}
/// Create a "by reference" adaptor for this instance of `Read`.
/// Creates a "by reference" adaptor for this instance of `Read`.
///
/// The returned adaptor also implements `Read` and will simply borrow this
/// current reader.
#[stable(feature = "rust1", since = "1.0.0")]
fn by_ref(&mut self) -> &mut Self where Self: Sized { self }
/// Transform this `Read` instance to an `Iterator` over its bytes.
/// Transforms this `Read` instance to an `Iterator` over its bytes.
///
/// The returned type implements `Iterator` where the `Item` is `Result<u8,
/// R::Err>`. The yielded item is `Ok` if a byte was successfully read and
@ -235,7 +235,7 @@ pub trait Read {
Bytes { inner: self }
}
/// Transform this `Read` instance to an `Iterator` over `char`s.
/// Transforms this `Read` instance to an `Iterator` over `char`s.
///
/// This adaptor will attempt to interpret this reader as an UTF-8 encoded
/// sequence of characters. The returned iterator will return `None` once
@ -252,7 +252,7 @@ pub trait Read {
Chars { inner: self }
}
/// Create an adaptor which will chain this stream with another.
/// Creates an adaptor which will chain this stream with another.
///
/// The returned `Read` instance will first read all bytes from this object
/// until EOF is encountered. Afterwards the output is equivalent to the
@ -262,7 +262,7 @@ pub trait Read {
Chain { first: self, second: next, done_first: false }
}
/// Create an adaptor which will read at most `limit` bytes from it.
/// Creates an adaptor which will read at most `limit` bytes from it.
///
/// This function returns a new instance of `Read` which will read at most
/// `limit` bytes, after which it will always return EOF (`Ok(0)`). Any
@ -403,7 +403,7 @@ pub trait Write {
}
}
/// Create a "by reference" adaptor for this instance of `Write`.
/// Creates a "by reference" adaptor for this instance of `Write`.
///
/// The returned adaptor also implements `Write` and will simply borrow this
/// current writer.