diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2016-01-16 02:03:07 +0100 |
---|---|---|
committer | Guillaume Martres <smarter@ubuntu.com> | 2016-01-16 21:26:59 +0100 |
commit | 17dcd7c7765c4d37540bf1140e258c857cffc7f7 (patch) | |
tree | df1099f221683f3d9b10f4a86618b72d66e309d1 | |
parent | 9a378b10a706f283a7337a1debe02e586d08c5ed (diff) | |
download | dotty-17dcd7c7765c4d37540bf1140e258c857cffc7f7.tar.gz dotty-17dcd7c7765c4d37540bf1140e258c857cffc7f7.tar.bz2 dotty-17dcd7c7765c4d37540bf1140e258c857cffc7f7.zip |
Always eta-expand AppliedTypeTrees arguments
This makes compileIndexedSeq pass again.
-rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 2 | ||||
-rw-r--r-- | test/dotc/tests.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index cb3bb0f20..511a12ea7 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -882,7 +882,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit else (arg, WildcardType) val arg1 = typed(desugaredArg, argPt) - adaptTypeArg(arg1, if (tparam.isCompleted) tparam.info else WildcardType) + adaptTypeArg(arg1, tparam.info) } val args1 = args.zipWithConserve(tparams)(typedArg(_, _)).asInstanceOf[List[Tree]] // check that arguments conform to bounds is done in phase PostTyper diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 16f8bdb30..354bc62d2 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -193,7 +193,7 @@ class tests extends CompilerTest { |./scala-scala/src/library/scala/collection/GenSeqLike.scala |./scala-scala/src/library/scala/collection/SeqLike.scala |./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin) - // @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") + @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") @Test def dotty = compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant"))(allowDeepSubtypes) // note the -deep argument |