diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/benchmarking/ParCtrie-map.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/overloaded-unapply.check (renamed from test/files/neg/t960.check) | 6 | ||||
| -rw-r--r-- | test/files/neg/overloaded-unapply.scala (renamed from test/files/neg/t960.scala) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/benchmarking/ParCtrie-map.scala b/test/benchmarking/ParCtrie-map.scala index c8de99f33e..f1d2f560b7 100644 --- a/test/benchmarking/ParCtrie-map.scala +++ b/test/benchmarking/ParCtrie-map.scala @@ -10,7 +10,7 @@ object Map extends testing.Benchmark { val par = sys.props("par").toInt val parctrie = ParCtrie((0 until length) zip (0 until length): _*) - collection.parallel.ForkJoinTasks.defaultForkJoinPool.setParallelism(par) + parctrie.tasksupport = new collection.parallel.ForkJoinTaskSupport(new scala.concurrent.forkjoin.ForkJoinPool(par)) def run = { parctrie map { diff --git a/test/files/neg/t960.check b/test/files/neg/overloaded-unapply.check index 603b1cb032..1da93f6939 100644 --- a/test/files/neg/t960.check +++ b/test/files/neg/overloaded-unapply.check @@ -1,13 +1,13 @@ -t960.scala:18: error: ambiguous reference to overloaded definition, +overloaded-unapply.scala:18: error: ambiguous reference to overloaded definition, both method unapply in object List of type [a](xs: List[a])Option[Null] and method unapply in object List of type [a](xs: List[a])Option[(a, List[a])] match argument types (List[a]) case List(x, xs) => 7 ^ -t960.scala:22: error: cannot resolve overloaded unapply +overloaded-unapply.scala:22: error: cannot resolve overloaded unapply case List(x, xs) => 7 ^ -t960.scala:12: error: method unapply is defined twice in t960.scala +overloaded-unapply.scala:12: error: method unapply is defined twice in overloaded-unapply.scala def unapply[a](xs: List[a]): Option[Null] = xs match { ^ three errors found diff --git a/test/files/neg/t960.scala b/test/files/neg/overloaded-unapply.scala index 36909626c1..36909626c1 100644 --- a/test/files/neg/t960.scala +++ b/test/files/neg/overloaded-unapply.scala |