Skip to content

Commit 7174c65

Browse files
committed
Also compile Function1/Function2 in stdlib.
It seems these work now that we have the special treatment of annotations. Let's see what the CI says.
1 parent ec35b84 commit 7174c65

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

compiler/src/dotty/tools/dotc/typer/FrontEnd.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ class FrontEnd extends Phase {
8484
}
8585
unitContexts foreach (parse(_))
8686
record("parsedTrees", ast.Trees.ntrees)
87-
unitContexts.foreach(ctx => println(ctx.compilationUnit))
8887
remaining = unitContexts
8988
while (remaining.nonEmpty) {
9089
enterSyms(remaining.head)

compiler/test/dotc/scala-collections.blacklist

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
## Errors having to do with bootstrap
2-
3-
../scala-scala/src/library/scala/Function1.scala
4-
../scala-scala/src/library/scala/Function2.scala
5-
# Cyclic reference because of @specialized annotation
6-
7-
81
## Errors having to do with deep subtypes
92

103
../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala

compiler/test/dotc/scala-collections.whitelist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@
581581

582582
../scala-scala/src/library/scala/Function.scala
583583
../scala-scala/src/library/scala/Function0.scala
584-
#../scala-scala/src/library/scala/Function1.scala
585-
#../scala-scala/src/library/scala/Function2.scala
584+
../scala-scala/src/library/scala/Function1.scala
585+
../scala-scala/src/library/scala/Function2.scala
586586
../scala-scala/src/library/scala/Function3.scala
587587
../scala-scala/src/library/scala/Function4.scala
588588
../scala-scala/src/library/scala/Function5.scala

0 commit comments

Comments
 (0)