aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotc
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2016-12-14 17:52:47 +0100
committerNicolas Stucki <nicolas.stucki@gmail.com>2016-12-18 16:15:01 +0100
commit1238e3a98203075089f2752ec2198cb56de408e2 (patch)
treee54fd3d06d621524502d4b85599225d6fc704ee7 /compiler/test/dotc
parent8cbae3c1fee24806514ebe42f8c7b734d3d7c144 (diff)
downloaddotty-1238e3a98203075089f2752ec2198cb56de408e2.tar.gz
dotty-1238e3a98203075089f2752ec2198cb56de408e2.tar.bz2
dotty-1238e3a98203075089f2752ec2198cb56de408e2.zip
Whitelist sources from scala/collection/parallel
Diffstat (limited to 'compiler/test/dotc')
-rw-r--r--compiler/test/dotc/scala-collections.blacklist67
-rw-r--r--compiler/test/dotc/scala-collections.whitelist20
2 files changed, 67 insertions, 20 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index 1677d5cfd..89403b080 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -85,37 +85,64 @@
../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
# assertion failed
-../scala-scala/src/library/scala/collection/parallel/Combiner.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/package.scala
../scala-scala/src/library/scala/collection/parallel/mutable/ParArray.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParHashMap.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParHashSet.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParHashTable.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParIterable.scala
+# 648 | class Map[S](f: T => S, targetarr: Array[Any], offset: Int, howmany: Int) extends Task[Unit, Map[S]] {
+# | ^
+# | overriding class Map in trait ParIterableLike;
+# | class Map cannot be used here - class definitions cannot be overridden
+
../scala-scala/src/library/scala/collection/parallel/mutable/ParMap.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParSeq.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
+# 42 | override def updated [U >: V](key: K, value: U): ParMap[K, U] = this + ((key, value))
+# | ^^^^^^^^^^^^^^^^^^^^^
+# | found: scala.collection.parallel.ParMap[K, U]
+# | required: scala.collection.parallel.mutable.ParMap'[K, U]
+# |
+# | where: ParMap is a trait in package parallel
+# | ParMap' is a trait in package mutable
+
+
../scala-scala/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
-../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
+# 91 | new { val chain = c } with ResizableParArrayCombiner[T] // was: with EnvironmentPassingCombiner[T, ParArray[T]]
+# | ^
+# | early definitions are not supported; use trait parameters instead
+
+../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
+# 136 | it.iterated = this.iterated
+# | ^^^^^^^^^^^
+# | value `iterated` is not a member of scala.collection.concurrent.TrieMapIterator[K, V](it)
+
../scala-scala/src/library/scala/collection/parallel/package.scala
+# 75 | implicit def factory2ops[From, Elem, To](bf: CanBuildFrom[From, Elem, To]) = new FactoryOps[From, Elem, To] {
+# | ^
+# | result type of implicit definition needs to be given explicitly
+
../scala-scala/src/library/scala/collection/parallel/ParIterable.scala
+# 304 | protected implicit def task2ops[R, Tp](tsk: SSCTask[R, Tp]) = new TaskOps[R, Tp] {
+# | ^
+# | result type of implicit definition needs to be given explicitly
+
../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala
+# 324 | protected implicit def delegatedSignalling2ops[PI <: DelegatedSignalling](it: PI) = new SignallingOps[PI] {
+# | ^
+# | result type of implicit definition needs to be given explicitly
+
../scala-scala/src/library/scala/collection/parallel/ParMap.scala
../scala-scala/src/library/scala/collection/parallel/ParMapLike.scala
-../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
+
../scala-scala/src/library/scala/collection/parallel/ParSeqLike.scala
-../scala-scala/src/library/scala/collection/parallel/ParSet.scala
-../scala-scala/src/library/scala/collection/parallel/ParSetLike.scala
-../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
+# 334 | protected trait Accessor[R, Tp] extends super.Accessor[R, Tp] {
+# | ^^^^^^^^^^^^^^^^^^^^^
+# | cyclic inheritance: trait Accessor extends itself
+
../scala-scala/src/library/scala/collection/parallel/RemainsIterator.scala
-../scala-scala/src/library/scala/collection/parallel/Splitter.scala
+# 617 | class Zipped[S](ti: SeqSplitter[S]) extends super.Zipped[S](ti) with SeqSplitter[(T, S)] {
+# | ^^^^^^^^^^^^^^^^^^
+# | cyclic inheritance: class Zipped extends itself
+
../scala-scala/src/library/scala/collection/parallel/Tasks.scala
-../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala
+# 429 | fjtask.body.result
+# | ^^^^^^^^^^^
+# | value `body` is not a member of ForkJoinTasks.this.WrappedTask[R, Tp](fjtask)
../scala-scala/src/library/scala/concurrent/Future.scala
# 188 | implicit val ec = internalExecutor
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index c39dbaa2d..85f6c46ba 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -452,3 +452,23 @@
../scala-scala/src/library/scala/concurrent/SyncVar.scala
../scala-scala/src/library/scala/concurrent/TaskRunner.scala
../scala-scala/src/library/scala/concurrent/ThreadPoolRunner.scala
+
+../scala-scala/src/library/scala/collection/parallel/Combiner.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/package.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParHashMap.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParHashSet.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParHashTable.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParIterable.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParSeq.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
+../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
+../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
+../scala-scala/src/library/scala/collection/parallel/ParSet.scala
+../scala-scala/src/library/scala/collection/parallel/ParSetLike.scala
+../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
+../scala-scala/src/library/scala/collection/parallel/Splitter.scala
+../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala