summaryrefslogtreecommitdiff
path: root/test/files/run/t3326.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-18 09:01:51 -0700
commitc5fdc815c30f0565a80a3837f368717a4e81e04d (patch)
tree48d2fc9de28b359fa9ef479e78388b9778f4ef52 /test/files/run/t3326.scala
parent42151a9980be37eae6e8fdf40330070361fd88fd (diff)
parentf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (diff)
downloadscala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.gz
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.tar.bz2
scala-c5fdc815c30f0565a80a3837f368717a4e81e04d.zip
Merge pull request #2961 from paulp/pr/whitespace
Cull extraneous whitespace.
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 -> "?"))
}
}