about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-03-23 17:05:45 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-03-23 17:05:45 -0400
commit1c25aecf675d731938951d048a45fb665105b441 (patch)
treede65e7d9dbf52e8dd51f7f1812c96844b478c2e2
parent71b9ba1e5b243e52b7c2828e35137eeba378d43f (diff)
parenta5e1cbe1915f9fd31900f25f72533fb296ff9a3a (diff)
downloadrust-1c25aecf675d731938951d048a45fb665105b441.tar.gz
rust-1c25aecf675d731938951d048a45fb665105b441.zip
Rollup merge of #23622 - steveklabnik:gh23196, r=alexcrichton
Fixes #23196
-rw-r--r--src/libstd/io/mod.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 237435d6dfb..39c718c96b3 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -558,6 +558,12 @@ pub trait BufRead: Read {
     /// This function does not perform any I/O, it simply informs this object
     /// that some amount of its buffer, returned from `fill_buf`, has been
     /// consumed and should no longer be returned.
+    ///
+    /// This function is used to tell the buffer how many bytes you've consumed
+    /// from the return value of `fill_buf`, and so may do odd things if
+    /// `fill_buf` isn't called before calling this.
+    ///
+    /// The `amt` must be `<=` the number of bytes in the buffer returned by `fill_buf`.
     #[stable(feature = "rust1", since = "1.0.0")]
     fn consume(&mut self, amt: usize);