summaryrefslogtreecommitdiff
path: root/test/files/run/t5879.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/t5879.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/t5879.scala')
-rw-r--r--test/files/run/t5879.scala20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/files/run/t5879.scala b/test/files/run/t5879.scala
index 18dd94289d..83a583da54 100644
--- a/test/files/run/t5879.scala
+++ b/test/files/run/t5879.scala
@@ -2,23 +2,23 @@ import collection.immutable.HashMap
object Test {
-
+
def main(args: Array[String]) {
resolveDefault()
resolveFirst()
resolveSecond()
resolveMany()
}
-
+
def resolveDefault() {
val a = HashMap(1 -> "1")
val b = HashMap(1 -> "2")
-
+
val r = a.merged(b)(null)
println(r)
println(r(1))
}
-
+
def resolveFirst() {
val a = HashMap(1 -> "1")
val b = HashMap(1 -> "2")
@@ -26,12 +26,12 @@ object Test {
println(a)
a
}
-
+
val r = a.merged(b) { collision }
println(r)
println(r(1))
}
-
+
def resolveSecond() {
val a = HashMap(1 -> "1")
val b = HashMap(1 -> "2")
@@ -39,21 +39,21 @@ object Test {
println(b)
b
}
-
+
val r = a.merged(b) { collision }
println(r)
println(r(1))
}
-
+
def resolveMany() {
val a = HashMap((0 until 100) zip (0 until 100): _*)
val b = HashMap((0 until 100) zip (100 until 200): _*)
def collision(a: (Int, Int), b: (Int, Int)) = {
(a._1, a._2 + b._2)
}
-
+
val r = a.merged(b) { collision }
for ((k, v) <- r) assert(v == 100 + 2 * k, (k, v))
}
-
+
}