summaryrefslogtreecommitdiff
path: root/src/library/scala/util/Sorting.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-11-20 15:16:45 +0000
committerPaul Phillips <paulp@improving.org>2009-11-20 15:16:45 +0000
commitf7b8e8f346fed1d8128976db959bff7001ed1d57 (patch)
tree59f18491ee87c9f33922b510f071f27013b355a6 /src/library/scala/util/Sorting.scala
parent99d8d53c36cb2283df9d42b25273aeba594e82b5 (diff)
downloadscala-f7b8e8f346fed1d8128976db959bff7001ed1d57.tar.gz
scala-f7b8e8f346fed1d8128976db959bff7001ed1d57.tar.bz2
scala-f7b8e8f346fed1d8128976db959bff7001ed1d57.zip
More world-shaking deprecation work.
object, updating some @deprecated messages to give realistic alternatives, properly resolving the semantic mismatch between List.-- and diff, its once-recommended but inequivalent alternative.
Diffstat (limited to 'src/library/scala/util/Sorting.scala')
-rw-r--r--src/library/scala/util/Sorting.scala16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/library/scala/util/Sorting.scala b/src/library/scala/util/Sorting.scala
index a7c83a5f43..73228b53d5 100644
--- a/src/library/scala/util/Sorting.scala
+++ b/src/library/scala/util/Sorting.scala
@@ -174,9 +174,9 @@ object Sorting {
// Swap partition elements back to middle
val n = off + len
- var s = Math.min(a-off, b-a)
+ var s = math.min(a-off, b-a)
vecswap(off, b-s, s)
- s = Math.min(d-c, n-d-1)
+ s = math.min(d-c, n-d-1)
vecswap(b, n-s, s)
// Recursively sort non-partition-elements
@@ -275,9 +275,9 @@ object Sorting {
// Swap partition elements back to middle
val n = off + len
- var s = Math.min(a-off, b-a)
+ var s = math.min(a-off, b-a)
vecswap(off, b-s, s)
- s = Math.min(d-c, n-d-1)
+ s = math.min(d-c, n-d-1)
vecswap(b, n-s, s)
// Recursively sort non-partition-elements
@@ -383,9 +383,9 @@ object Sorting {
// Swap partition elements back to middle
val n = off + len
- var s = Math.min(a-off, b-a)
+ var s = math.min(a-off, b-a)
vecswap(off, b-s, s)
- s = Math.min(d-c, n-d-1)
+ s = math.min(d-c, n-d-1)
vecswap(b, n-s, s)
// Recursively sort non-partition-elements
@@ -491,9 +491,9 @@ object Sorting {
// Swap partition elements back to middle
val n = off + len
- var s = Math.min(a-off, b-a)
+ var s = math.min(a-off, b-a)
vecswap(off, b-s, s)
- s = Math.min(d-c, n-d-1)
+ s = math.min(d-c, n-d-1)
vecswap(b, n-s, s)
// Recursively sort non-partition-elements