about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-11-10 10:51:48 -0500
committerSteve Klabnik <steve@steveklabnik.com>2015-11-10 10:51:48 -0500
commit4b0503f10f19aea023337ad8e82116690a238628 (patch)
treec6bff8ac7c75ef974389461e1c51b65551867ac4 /src
parentaf1cb3090dd972acf77f560dfe80d0908cde4ba3 (diff)
parentabb9c9008fbb253f82dfc0e7c72dcd107e820fb7 (diff)
downloadrust-4b0503f10f19aea023337ad8e82116690a238628.tar.gz
rust-4b0503f10f19aea023337ad8e82116690a238628.zip
Rollup merge of #29731 - steveklabnik:smallfix, r=alexcrichton
* wrap to 80 cols
* small grammar fix, missing 'the'
Diffstat (limited to 'src')
-rw-r--r--src/libcore/iter.rs27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index da7d673cd96..f8c6e3cfdd7 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -371,22 +371,21 @@ pub trait Iterator {
     ///
     /// # Implementation notes
     ///
-    /// It is not enforced that an iterator implementation yields the
-    /// declared number of elements. A buggy iterator may yield less
-    /// than the lower bound or more than the upper bound of elements.
+    /// It is not enforced that an iterator implementation yields the declared
+    /// number of elements. A buggy iterator may yield less than the lower bound
+    /// or more than the upper bound of elements.
     ///
-    /// `size_hint()` is primarily intended to be used for optimizations
-    /// such as reserving space for the elements of the iterator, but
-    /// must not be trusted to e.g. omit bounds checks in unsafe code.
-    /// An incorrect implementation of `size_hint()` should not lead to
-    /// memory safety violations.
+    /// `size_hint()` is primarily intended to be used for optimizations such as
+    /// reserving space for the elements of the iterator, but must not be
+    /// trusted to e.g. omit bounds checks in unsafe code. An incorrect
+    /// implementation of `size_hint()` should not lead to memory safety
+    /// violations.
     ///
-    /// That said, the implementation should provide a correct
-    /// estimation, because otherwise it would be a violation of the
-    /// trait's protocol.
+    /// That said, the implementation should provide a correct estimation,
+    /// because otherwise it would be a violation of the trait's protocol.
     ///
-    /// The default implementation returns `(0, None)` which is correct
-    /// for any iterator.
+    /// The default implementation returns `(0, None)` which is correct for any
+    /// iterator.
     ///
     /// # Examples
     ///
@@ -2750,7 +2749,7 @@ pub trait ExactSizeIterator: Iterator {
     /// implementation, you can do so. See the [trait-level] docs for an
     /// example.
     ///
-    /// This function has the same safety guarantees as [`size_hint()`]
+    /// This function has the same safety guarantees as the [`size_hint()`]
     /// function.
     ///
     /// [trait-level]: trait.ExactSizeIterator.html