Skip to content

Commit 4acda4d

Browse files
committed
Whitelist sources from scala/collection/parallel
1 parent 0576b8f commit 4acda4d

File tree

2 files changed

+67
-20
lines changed

2 files changed

+67
-20
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,64 @@
8585
../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
8686
# assertion failed
8787

88-
../scala-scala/src/library/scala/collection/parallel/Combiner.scala
89-
../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala
90-
../scala-scala/src/library/scala/collection/parallel/mutable/package.scala
9188
../scala-scala/src/library/scala/collection/parallel/mutable/ParArray.scala
92-
../scala-scala/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
93-
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashMap.scala
94-
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashSet.scala
95-
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashTable.scala
96-
../scala-scala/src/library/scala/collection/parallel/mutable/ParIterable.scala
89+
# 648 | class Map[S](f: T => S, targetarr: Array[Any], offset: Int, howmany: Int) extends Task[Unit, Map[S]] {
90+
# | ^
91+
# | overriding class Map in trait ParIterableLike;
92+
# | class Map cannot be used here - class definitions cannot be overridden
93+
9794
../scala-scala/src/library/scala/collection/parallel/mutable/ParMap.scala
98-
../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
99-
../scala-scala/src/library/scala/collection/parallel/mutable/ParSeq.scala
100-
../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
101-
../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
102-
../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
95+
# 42 | override def updated [U >: V](key: K, value: U): ParMap[K, U] = this + ((key, value))
96+
# | ^^^^^^^^^^^^^^^^^^^^^
97+
# | found: scala.collection.parallel.ParMap[K, U]
98+
# | required: scala.collection.parallel.mutable.ParMap'[K, U]
99+
# |
100+
# | where: ParMap is a trait in package parallel
101+
# | ParMap' is a trait in package mutable
102+
103+
103104
../scala-scala/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
104-
../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
105+
# 91 | new { val chain = c } with ResizableParArrayCombiner[T] // was: with EnvironmentPassingCombiner[T, ParArray[T]]
106+
# | ^
107+
# | early definitions are not supported; use trait parameters instead
108+
109+
../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
110+
# 136 | it.iterated = this.iterated
111+
# | ^^^^^^^^^^^
112+
# | value `iterated` is not a member of scala.collection.concurrent.TrieMapIterator[K, V](it)
113+
105114
../scala-scala/src/library/scala/collection/parallel/package.scala
115+
# 75 | implicit def factory2ops[From, Elem, To](bf: CanBuildFrom[From, Elem, To]) = new FactoryOps[From, Elem, To] {
116+
# | ^
117+
# | result type of implicit definition needs to be given explicitly
118+
106119
../scala-scala/src/library/scala/collection/parallel/ParIterable.scala
120+
# 304 | protected implicit def task2ops[R, Tp](tsk: SSCTask[R, Tp]) = new TaskOps[R, Tp] {
121+
# | ^
122+
# | result type of implicit definition needs to be given explicitly
123+
107124
../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala
125+
# 324 | protected implicit def delegatedSignalling2ops[PI <: DelegatedSignalling](it: PI) = new SignallingOps[PI] {
126+
# | ^
127+
# | result type of implicit definition needs to be given explicitly
128+
108129
../scala-scala/src/library/scala/collection/parallel/ParMap.scala
109130
../scala-scala/src/library/scala/collection/parallel/ParMapLike.scala
110-
../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
131+
111132
../scala-scala/src/library/scala/collection/parallel/ParSeqLike.scala
112-
../scala-scala/src/library/scala/collection/parallel/ParSet.scala
113-
../scala-scala/src/library/scala/collection/parallel/ParSetLike.scala
114-
../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
133+
# 334 | protected trait Accessor[R, Tp] extends super.Accessor[R, Tp] {
134+
# | ^^^^^^^^^^^^^^^^^^^^^
135+
# | cyclic inheritance: trait Accessor extends itself
136+
115137
../scala-scala/src/library/scala/collection/parallel/RemainsIterator.scala
116-
../scala-scala/src/library/scala/collection/parallel/Splitter.scala
138+
# 617 | class Zipped[S](ti: SeqSplitter[S]) extends super.Zipped[S](ti) with SeqSplitter[(T, S)] {
139+
# | ^^^^^^^^^^^^^^^^^^
140+
# | cyclic inheritance: class Zipped extends itself
141+
117142
../scala-scala/src/library/scala/collection/parallel/Tasks.scala
118-
../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala
143+
# 429 | fjtask.body.result
144+
# | ^^^^^^^^^^^
145+
# | value `body` is not a member of ForkJoinTasks.this.WrappedTask[R, Tp](fjtask)
119146

120147
../scala-scala/src/library/scala/concurrent/Future.scala
121148
# 188 | implicit val ec = internalExecutor

compiler/test/dotc/scala-collections.whitelist

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,3 +450,23 @@
450450
../scala-scala/src/library/scala/concurrent/SyncVar.scala
451451
../scala-scala/src/library/scala/concurrent/TaskRunner.scala
452452
../scala-scala/src/library/scala/concurrent/ThreadPoolRunner.scala
453+
454+
../scala-scala/src/library/scala/collection/parallel/Combiner.scala
455+
../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala
456+
../scala-scala/src/library/scala/collection/parallel/mutable/package.scala
457+
../scala-scala/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
458+
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashMap.scala
459+
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashSet.scala
460+
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashTable.scala
461+
../scala-scala/src/library/scala/collection/parallel/mutable/ParIterable.scala
462+
../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
463+
../scala-scala/src/library/scala/collection/parallel/mutable/ParSeq.scala
464+
../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
465+
../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
466+
../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
467+
../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
468+
../scala-scala/src/library/scala/collection/parallel/ParSet.scala
469+
../scala-scala/src/library/scala/collection/parallel/ParSetLike.scala
470+
../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
471+
../scala-scala/src/library/scala/collection/parallel/Splitter.scala
472+
../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala

0 commit comments

Comments
 (0)