summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-04-13 16:32:01 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-04-13 16:32:01 +0000
commit9334ad0db28f62c3e1d33d6b12e03720a76fb1eb (patch)
tree69e6c6eb0c6a9b714447cc8eaa2331cbd1233c33 /test/files/neg
parentaf358131de08e41bdb3d2bba46f309f0c03ab03b (diff)
downloadscala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.tar.gz
scala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.tar.bz2
scala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.zip
Fixed some tests, renamed from Any to Gen.
No review.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t3774.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t3774.check b/test/files/neg/t3774.check
index a3953133bc..ea35c50541 100644
--- a/test/files/neg/t3774.check
+++ b/test/files/neg/t3774.check
@@ -1,6 +1,6 @@
t3774.scala:4: error: overloaded method value ++ with alternatives:
- [B1 >: List[Int]](xs: scala.collection.AnyTraversableOnce[((Int, Int), B1)])scala.collection.immutable.Map[(Int, Int),B1] <and>
- [B >: ((Int, Int), List[Int]),That](that: scala.collection.AnyTraversableOnce[B])(implicit bf: scala.collection.generic.CanBuildFrom[scala.collection.immutable.Map[(Int, Int),List[Int]],B,That])That
+ [B1 >: List[Int]](xs: scala.collection.GenTraversableOnce[((Int, Int), B1)])scala.collection.immutable.Map[(Int, Int),B1] <and>
+ [B >: ((Int, Int), List[Int]),That](that: scala.collection.GenTraversableOnce[B])(implicit bf: scala.collection.generic.CanBuildFrom[scala.collection.immutable.Map[(Int, Int),List[Int]],B,That])That
cannot be applied to (scala.collection.immutable.IndexedSeq[((Int, Int), scala.collection.immutable.Range.Inclusive)])
Map[(Int,Int),List[Int]]() ++ (for(x <- 0 to 1 ; y <- 0 to 1) yield {(x,y)-> (0 to 1)})
^