diff options
| -rwxr-xr-x | build.xml | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1623,7 +1623,7 @@ TODO: </target> <!-- See test/build-partest.xml for the macro(s) being used here. --> - <target name="partest.task" depends="init,pack.done"> + <target name="partest.task" depends="pack.done"> <!-- note the classpathref! this is the classpath used to run partest, so it must have the new compiler.... --> <taskdef @@ -1631,7 +1631,7 @@ TODO: resource="scala/tools/partest/antlib.xml"/> </target> - <target name="test.suite.init" depends="pack.done, partest.task"> + <target name="test.suite.init" depends="partest.task"> <!-- read by test/partest to determine classpath used to run partest --> <propertyfile file = "build/pack/partest.properties"> <entry key = "partest.classpath" value="${toString:partest.compilation.path}"/> diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index ecd987b031..7d61e701fe 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2484,7 +2484,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper assert(pt.typeSymbol == PartialFunctionClass, s"PartialFunction synthesis for match in $tree requires PartialFunction expected type, but got $pt.") val targs = pt.dealiasWiden.typeArgs - // if targs.head isn't fully defined, we can translate --> error + // if targs.head isn't fully defined, we can't translate --> error targs match { case argTp :: _ if isFullyDefined(argTp) => // ok case _ => // uh-oh |