summaryrefslogtreecommitdiff
path: root/test/files/run/t3326.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-18 00:09:46 -0700
committerPaul Phillips <paulp@improving.org>2013-09-18 07:13:38 -0700
commitf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (patch)
tree174861715807c23ba332f78769a9f7e1377b7f02 /test/files/run/t3326.scala
parentd45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (diff)
downloadscala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.gz
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.bz2
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.zip
Cull extraneous whitespace.
One last flurry with the broom before I leave you slobs to code in your own filth. Eliminated all the trailing whitespace I could manage, with special prejudice reserved for the test cases which depended on the preservation of trailing whitespace. Was reminded I cannot figure out how to eliminate the trailing space on the "scala> " prompt in repl transcripts. At least reduced the number of such empty prompts by trimming transcript code on the way in. Routed ConsoleReporter's "printMessage" through a trailing whitespace stripping method which might help futureproof against the future of whitespace diseases. Deleted the up-to-40 lines of trailing whitespace found in various library files. It seems like only yesterday we performed whitespace surgery on the whole repo. Clearly it doesn't stick very well. I suggest it would work better to enforce a few requirements on the way in.
Diffstat (limited to 'test/files/run/t3326.scala')
-rw-r--r--test/files/run/t3326.scala28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/files/run/t3326.scala b/test/files/run/t3326.scala
index f70cb01504..4ac7ef9138 100644
--- a/test/files/run/t3326.scala
+++ b/test/files/run/t3326.scala
@@ -10,7 +10,7 @@ import scala.math.Ordering
*
* There are 2 `++` overloads - a generic one in traversables and
* a map-specific one in `MapLike` - which knows about the ordering.
- *
+ *
* The problem here is that the expected return type for the expression
* in which `++` appears drives the decision of the overload that needs
* to be taken.
@@ -18,36 +18,36 @@ import scala.math.Ordering
* `SortedMap`, but `immutable.Map` instead.
* This is why `collection.SortedMap` used to resort to the generic
* `TraversableLike.++` which knows nothing about the ordering.
- *
+ *
* To avoid `collection.SortedMap`s resort to the more generic `TraverableLike.++`,
* we override the `MapLike.++` overload in `collection.SortedMap` to return
* the proper type `SortedMap`.
*/
object Test {
-
+
def main(args: Array[String]) {
testCollectionSorted()
testImmutableSorted()
}
-
+
def testCollectionSorted() {
import collection._
val order = implicitly[Ordering[Int]].reverse
var m1: SortedMap[Int, String] = SortedMap.empty[Int, String](order)
var m2: SortedMap[Int, String] = SortedMap.empty[Int, String](order)
-
+
m1 += (1 -> "World")
m1 += (2 -> "Hello")
-
+
m2 += (4 -> "Bar")
m2 += (5 -> "Foo")
-
+
val m3: SortedMap[Int, String] = m1 ++ m2
-
+
println(m1)
println(m2)
println(m3)
-
+
println(m1 + (3 -> "?"))
}
@@ -56,19 +56,19 @@ object Test {
val order = implicitly[Ordering[Int]].reverse
var m1: SortedMap[Int, String] = SortedMap.empty[Int, String](order)
var m2: SortedMap[Int, String] = SortedMap.empty[Int, String](order)
-
+
m1 += (1 -> "World")
m1 += (2 -> "Hello")
-
+
m2 += (4 -> "Bar")
m2 += (5 -> "Foo")
-
+
val m3: SortedMap[Int, String] = m1 ++ m2
-
+
println(m1)
println(m2)
println(m3)
-
+
println(m1 + (3 -> "?"))
}
}