Skip to content

Commit cfe92aa

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

File tree

2 files changed

+37
-14
lines changed

2 files changed

+37
-14
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,32 @@
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
106115
../scala-scala/src/library/scala/collection/parallel/ParIterable.scala
107116
../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala

compiler/test/dotc/scala-collections.whitelist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,3 +450,17 @@
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

0 commit comments

Comments
 (0)