aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2016-02-08 17:17:50 +0100
committerodersky <odersky@gmail.com>2016-02-08 17:17:50 +0100
commitcb5935ec641b5e36b1b2c7da7d25a5013dfab890 (patch)
tree1fd78a6443d19b6d698a7c9cf21d5bf45401cee5 /tests
parent0c4eb3305b0adf82f779f6e88bb01f7274ce00b9 (diff)
parentae09ac296f192d9b2229e2cd92bac4715f77e207 (diff)
downloaddotty-cb5935ec641b5e36b1b2c7da7d25a5013dfab890.tar.gz
dotty-cb5935ec641b5e36b1b2c7da7d25a5013dfab890.tar.bz2
dotty-cb5935ec641b5e36b1b2c7da7d25a5013dfab890.zip
Merge pull request #1053 from dotty-staging/fix-#1045
Fix #1045
Diffstat (limited to 'tests')
-rw-r--r--tests/disabled/run/t5293-map.scala (renamed from tests/run/t5293-map.scala)0
-rw-r--r--tests/pos/i1045.scala7
-rw-r--r--tests/pos/intersection.scala4
3 files changed, 8 insertions, 3 deletions
diff --git a/tests/run/t5293-map.scala b/tests/disabled/run/t5293-map.scala
index 1ef7d97e5..1ef7d97e5 100644
--- a/tests/run/t5293-map.scala
+++ b/tests/disabled/run/t5293-map.scala
diff --git a/tests/pos/i1045.scala b/tests/pos/i1045.scala
new file mode 100644
index 000000000..f5985af92
--- /dev/null
+++ b/tests/pos/i1045.scala
@@ -0,0 +1,7 @@
+import scala.collection._
+object T {
+ val newSymbolMap: mutable.HashMap[String, mutable.HashMap[Int, Double]] = mutable.HashMap.empty
+ val map = newSymbolMap.getOrElse("a", mutable.HashMap.empty)
+ map.put(1, 0.0)
+ newSymbolMap.put("a", map)
+}
diff --git a/tests/pos/intersection.scala b/tests/pos/intersection.scala
index 2b9f6c0b7..a4c19b5af 100644
--- a/tests/pos/intersection.scala
+++ b/tests/pos/intersection.scala
@@ -1,3 +1,4 @@
+import dotty.language.keepUnions
object intersection {
class A
@@ -11,9 +12,6 @@ object intersection {
val a: A & B => Unit = z
val b: (A => Unit) | (B => Unit) = z
-
-
-
type needsA = A => Nothing
type needsB = B => Nothing
}