Skip to content

Commit 23be74b

Browse files
committed
More reorgs to scala-collectons lists
- Move non-specialized functions to whitelist - Replace `macro ???` with just `???` in scala-scala Several other consolidations
1 parent 0d3394f commit 23be74b

File tree

2 files changed

+31
-47
lines changed

2 files changed

+31
-47
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,7 @@
5252

5353
../scala-scala/src/library/scala/Function1.scala
5454
../scala-scala/src/library/scala/Function2.scala
55-
../scala-scala/src/library/scala/Function3.scala
56-
../scala-scala/src/library/scala/Function4.scala
57-
../scala-scala/src/library/scala/Function5.scala
58-
../scala-scala/src/library/scala/Function6.scala
59-
../scala-scala/src/library/scala/Function7.scala
60-
../scala-scala/src/library/scala/Function8.scala
61-
../scala-scala/src/library/scala/Function9.scala
62-
../scala-scala/src/library/scala/Function10.scala
63-
../scala-scala/src/library/scala/Function11.scala
64-
../scala-scala/src/library/scala/Function12.scala
65-
../scala-scala/src/library/scala/Function13.scala
66-
../scala-scala/src/library/scala/Function14.scala
67-
../scala-scala/src/library/scala/Function15.scala
68-
../scala-scala/src/library/scala/Function16.scala
69-
../scala-scala/src/library/scala/Function17.scala
70-
../scala-scala/src/library/scala/Function18.scala
71-
../scala-scala/src/library/scala/Function19.scala
72-
../scala-scala/src/library/scala/Function20.scala
73-
../scala-scala/src/library/scala/Function21.scala
74-
../scala-scala/src/library/scala/Function22.scala
55+
# Cyclic reference because of @specialized annotation
7556

7657
../scala-scala/src/library/scala/ref/WeakReference.scala
7758
# 33 | if (x != null) Some(x) else None
@@ -90,14 +71,6 @@
9071
# 104 | private def readResolve(): Any = Manifest.Short
9172
# | ^^^^^^^^
9273
# | not found: Manifest
93-
../scala-scala/src/library/scala/reflect/NameTransformer.scala
94-
# 89 | if (buf eq null) name else buf.toString()
95-
# | ^^^^^^^^^^^^^^
96-
# | missing argument for parameter index of method apply: (index: Int)Char
97-
../scala-scala/src/library/scala/reflect/package.scala
98-
# 63 | private[scala] def materializeClassTag[T](): ClassTag[T] = macro ???
99-
# | ^^^^^
100-
# | not found: macro
10174

10275
../scala-scala/src/library/scala/runtime/Tuple2Zipped.scala
10376
# 122 | val buf = bf(x._1)
@@ -111,25 +84,8 @@
11184
# | found: T1
11285
# | required: CC1[_]
11386

114-
../scala-scala/src/library/scala/StringContext.scala
115-
# 168 | def f[A >: Any](args: A*): String = macro ???
116-
# | ^^^^^
117-
# | not found: macro
118-
11987
../scala-scala/src/library/scala/text/Document.scala
120-
121-
../scala-scala/src/library/scala/util/control/Exception.scala
122-
# scala.MatchError: PostfixOp(Select(Ident(pf),isDefinedAt),_) (of class dotty.tools.dotc.ast.untpd$PostfixOp)
123-
# at dotty.tools.dotc.ast.Trees$Instance$TreeAccumulator.foldOver(Trees.scala:1173)
88+
# Lots of type errors for pattern matches
12489

12590
../scala-scala/src/library/scala/util/control/TailCalls.scala
126-
# assertion failed
127-
128-
../scala-scala/src/library/scala/util/hashing/Hashing.scala
129-
# 35 | implicit def default[T] = new Default[T]
130-
# | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
131-
# | result type of implicit definition needs to be given explicitly
132-
133-
134-
../scala-scala/src/library/scala/sys/SystemProperties.scala
135-
# crashes on dotty.tools.dottydoc.TestWhitelistedCollections.arrayHasDocumentation
91+
# -Ycheck:classOf failure

compiler/test/dotc/scala-collections.whitelist

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
../scala-scala/src/library/scala/Serializable.scala
6363
../scala-scala/src/library/scala/Specializable.scala
6464
../scala-scala/src/library/scala/Symbol.scala
65+
../scala-scala/src/library/scala/StringContext.scala
6566
../scala-scala/src/library/scala/UninitializedError.scala
6667
../scala-scala/src/library/scala/UninitializedFieldError.scala
6768
../scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala
@@ -290,12 +291,14 @@
290291

291292
../scala-scala/src/library/scala/util/Try.scala
292293

294+
../scala-scala/src/library/scala/util/control/Exception.scala
293295
../scala-scala/src/library/scala/util/control/Breaks.scala
294296
../scala-scala/src/library/scala/util/control/ControlThrowable.scala
295297
../scala-scala/src/library/scala/util/control/NonFatal.scala
296298
../scala-scala/src/library/scala/util/control/NoStackTrace.scala
297299
../scala-scala/src/library/scala/util/DynamicVariable.scala
298300
../scala-scala/src/library/scala/util/Either.scala
301+
../scala-scala/src/library/scala/util/hashing/Hashing.scala
299302
../scala-scala/src/library/scala/util/hashing/ByteswapHashing.scala
300303
../scala-scala/src/library/scala/util/hashing/MurmurHash3.scala
301304
../scala-scala/src/library/scala/util/hashing/package.scala
@@ -396,6 +399,7 @@
396399
../scala-scala/src/library/scala/compat/Platform.scala
397400

398401
../scala-scala/src/library/scala/sys/package.scala
402+
../scala-scala/src/library/scala/sys/SystemProperties.scala
399403
../scala-scala/src/library/scala/sys/Prop.scala
400404
../scala-scala/src/library/scala/sys/PropImpl.scala
401405
../scala-scala/src/library/scala/sys/BooleanProp.scala
@@ -437,6 +441,8 @@
437441
../scala-scala/src/library/scala/reflect/macros/internal/macroImpl.scala
438442
../scala-scala/src/library/scala/reflect/NoManifest.scala
439443
../scala-scala/src/library/scala/reflect/OptManifest.scala
444+
../scala-scala/src/library/scala/reflect/NameTransformer.scala
445+
../scala-scala/src/library/scala/reflect/package.scala
440446

441447
../scala-scala/src/library/scala/Responder.scala
442448

@@ -569,6 +575,28 @@
569575

570576
../scala-scala/src/library/scala/Function.scala
571577
../scala-scala/src/library/scala/Function0.scala
578+
#../scala-scala/src/library/scala/Function1.scala
579+
#../scala-scala/src/library/scala/Function2.scala
580+
../scala-scala/src/library/scala/Function3.scala
581+
../scala-scala/src/library/scala/Function4.scala
582+
../scala-scala/src/library/scala/Function5.scala
583+
../scala-scala/src/library/scala/Function6.scala
584+
../scala-scala/src/library/scala/Function7.scala
585+
../scala-scala/src/library/scala/Function8.scala
586+
../scala-scala/src/library/scala/Function9.scala
587+
../scala-scala/src/library/scala/Function10.scala
588+
../scala-scala/src/library/scala/Function11.scala
589+
../scala-scala/src/library/scala/Function12.scala
590+
../scala-scala/src/library/scala/Function13.scala
591+
../scala-scala/src/library/scala/Function14.scala
592+
../scala-scala/src/library/scala/Function15.scala
593+
../scala-scala/src/library/scala/Function16.scala
594+
../scala-scala/src/library/scala/Function17.scala
595+
../scala-scala/src/library/scala/Function18.scala
596+
../scala-scala/src/library/scala/Function19.scala
597+
../scala-scala/src/library/scala/Function20.scala
598+
../scala-scala/src/library/scala/Function21.scala
599+
../scala-scala/src/library/scala/Function22.scala
572600

573601
../scala-scala/src/library/scala/Tuple1.scala
574602
../scala-scala/src/library/scala/Tuple2.scala

0 commit comments

Comments
 (0)