about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-25 13:47:46 +0000
committerbors <bors@rust-lang.org>2014-09-25 13:47:46 +0000
commit58413c09cd52ea4005d6ea7733ba1fb3a8f36589 (patch)
tree638065c6bce4d5f1c4e4c4ab3f76149e815b388a
parent375fe17218965e77ed46ab458da53cb90e2e83f5 (diff)
parente87209ecd6fd22bde2185083e7034c674498d915 (diff)
downloadrust-58413c09cd52ea4005d6ea7733ba1fb3a8f36589.tar.gz
rust-58413c09cd52ea4005d6ea7733ba1fb3a8f36589.zip
auto merge of #17498 : coyotebush/rust/iter-doc, r=huonw
OrdIterator: the doc says that values must implement `PartialOrd`, while the implementation is only for `Ord` values. It looks like this initially got out of sync in 4e1c215. Removed the doc sentence entirely since it seems redundant.

MultiplicativeIterator: Fixed weird sentence.
-rw-r--r--src/libcore/iter.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index f84c5eec452..f78c8c2aa0e 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -811,8 +811,7 @@ impl<A: Add<A, A> + Zero, T: Iterator<A>> AdditiveIterator<A> for T {
     }
 }
 
-/// A trait for iterators over elements whose elements can be multiplied
-/// together.
+/// A trait for iterators over elements which can be multiplied together.
 pub trait MultiplicativeIterator<A> {
     /// Iterates over the entire iterator, multiplying all the elements
     ///
@@ -840,7 +839,6 @@ impl<A: Mul<A, A> + One, T: Iterator<A>> MultiplicativeIterator<A> for T {
 }
 
 /// A trait for iterators over elements which can be compared to one another.
-/// The type of each element must ascribe to the `PartialOrd` trait.
 pub trait OrdIterator<A> {
     /// Consumes the entire iterator to return the maximum element.
     ///