about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-30 19:04:02 +0000
committerbors <bors@rust-lang.org>2015-09-30 19:04:02 +0000
commit1c788d0a9a623221da12437b01a35ea899a03d9b (patch)
treeba0bf80b3df642fff057f7387fa72fd19f633648 /src/libstd
parentdcb167e14784edff2021869b92dff4dd585e64a2 (diff)
parent15ee0e908cceea56edbe56d595191d5609d6a1dc (diff)
downloadrust-1c788d0a9a623221da12437b01a35ea899a03d9b.tar.gz
rust-1c788d0a9a623221da12437b01a35ea899a03d9b.zip
Auto merge of #28769 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #28743, #28744, #28745, #28749, #28754, #28755, #28757, #28759, #28761, #28762, #28763, #28765
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/mod.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 54869807cac..a76755dadd3 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -370,6 +370,13 @@ fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize>
 /// throughout `std::io` take and provide types which implement the `Read`
 /// trait.
 ///
+/// Please note that each call to `read` may involve a system call, and
+/// therefore, using something that implements [`BufRead`][bufread], such as
+/// [`BufReader`][bufreader], will be more efficient.
+///
+/// [bufread]: trait.BufRead.html
+/// [bufreader]: struct.BufReader.html
+///
 /// # Examples
 ///
 /// [`File`][file]s implement `Read`: