diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
| commit | 517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch) | |
| tree | 609c95d6aafff786460300162991ce5b31fe8c32 /test/files/neg | |
| parent | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff) | |
| download | scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2 scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip | |
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'test/files/neg')
| -rwxr-xr-x | test/files/neg/t3115.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t3774.check | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t3115.scala b/test/files/neg/t3115.scala index 4aeeb4063e..3888085593 100755 --- a/test/files/neg/t3115.scala +++ b/test/files/neg/t3115.scala @@ -1,5 +1,5 @@ object sc { - @deprecated("") object Math + @deprecated("", "2.8.0") object Math } object Test { diff --git a/test/files/neg/t3774.check b/test/files/neg/t3774.check index 59c63c4ee8..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.TraversableOnce[((Int, Int), B1)])scala.collection.immutable.Map[(Int, Int),B1] <and> - [B >: ((Int, Int), List[Int]),That](that: scala.collection.TraversableOnce[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)}) ^ |