diff options
author | Paul Phillips <paulp@improving.org> | 2009-08-28 12:39:50 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-08-28 12:39:50 +0000 |
commit | d582588b6d6837099d0b391ff5fc70700dc05dce (patch) | |
tree | 918258703460f2f90cfe37c3b2abedf445810d4a /src/library/scala/collection/Iterable.scala | |
parent | ce362ef76f84ff1198e0e99d08f82b788d24ddf1 (diff) | |
download | scala-d582588b6d6837099d0b391ff5fc70700dc05dce.tar.gz scala-d582588b6d6837099d0b391ff5fc70700dc05dce.tar.bz2 scala-d582588b6d6837099d0b391ff5fc70700dc05dce.zip |
A bunch of cleanups around Ordered & Ordering, ...
A bunch of cleanups around Ordered & Ordering, and provided
PartialOrdering with the "partial" part it had never been given.
Diffstat (limited to 'src/library/scala/collection/Iterable.scala')
-rw-r--r-- | src/library/scala/collection/Iterable.scala | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index 551106d385..218dcc65e2 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -65,29 +65,11 @@ object Iterable extends TraversableFactory[Iterable] { /** The minimum element of a non-empty sequence of ordered elements */ @deprecated("use seq.min instead") - def min[A <% Ordered[A]](seq: Iterable[A]): A = { - val xs = seq.iterator - if (!xs.hasNext) throw new IllegalArgumentException("min(<empty>)") - var min = xs.next - while (xs.hasNext) { - val x = xs.next - if (x < min) min = x - } - min - } + def min[A](seq: Iterable[A])(implicit ord: Ordering[A]): A = seq.min /** The maximum element of a non-empty sequence of ordered elements */ @deprecated("use seq.max instead") - def max[A <% Ordered[A]](seq: Iterable[A]): A = { - val xs = seq.iterator - if (!xs.hasNext) throw new IllegalArgumentException("max(<empty>)") - var max = xs.next - while (xs.hasNext) { - val x = xs.next - if (max < x) max = x - } - max - } + def max[A](seq: Iterable[A])(implicit ord: Ordering[A]): A = seq.max @deprecated("use View instead") type Projection[A] = IterableView[A, Coll] } |