Fix rebase breakage

Author: odersky

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -153,7 +153,7 @@ object Types {
     }
 
     def isInfixType(implicit ctx: Context): Boolean = this match {
-      case TypeApplications.AppliedType(tycon, args) =>
+      case TypeApplications.AnyAppliedType(tycon, args) =>
         args.length == 2 &&
           !Character.isUnicodeIdentifierStart(tycon.typeSymbol.name.toString.head)
           // TODO: Once we use the 2.12 stdlib, also check the @showAsInfix annotation

repl/src/dotty/tools/repl/UserFacingPrinter.scala

@@ -7,7 +7,7 @@ import dotc.core.Constants.Constant
 import dotc.core.Contexts.Context
 import dotc.core.Denotations.{ Denotation, MultiDenotation, SingleDenotation }
 import dotc.core.Flags._
-import dotc.core.TypeApplications.{ AppliedType, EtaExpansion }
+import dotc.core.TypeApplications.{ AnyAppliedType, EtaExpansion }
 import dotc.core.Names._
 import dotc.core.NameOps._
 import dotc.core.StdNames._
@@ -105,7 +105,7 @@ class UserFacingPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     }
     case EtaExpansion(tycon) => toText(tycon)
     case PolyType(params, res) =>
-      "[" ~ Fluid(params.map(tl => toText(tl.toArg)).intersperse(Str(", "))) ~ "]" ~ toText(res)
+      "[" ~ Fluid(params.map(tl => toText(tl.paramRef)).intersperse(Str(", "))) ~ "]" ~ toText(res)
     case tp: MethodType => {
       def paramText(name: TermName, tp: Type) = toText(name) ~ ": " ~ toText(tp)
       changePrec(GlobalPrec) {
@@ -115,7 +115,7 @@ class UserFacingPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         toText(tp.resultType)
       }
     }
-    case AppliedType(tycon, args) => {
+    case AnyAppliedType(tycon, args) => {
       def toTextInfixType(tycon: Type, args: List[Type]): Text = {
         // TODO: blatant copy from `RefinedPrinter`
         val l :: r :: Nil = args