diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-06-29 20:16:46 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:35:05 +0200 |
| commit | 9a90e8167f4694576670a5943ec147757b460af5 (patch) | |
| tree | b1f1fdcafeb0fc358910878c532096962f1685c5 /src/dotty/tools/dotc | |
| parent | 09f7ab1554b1207beb1a7c604e103a1178b6a263 (diff) | |
| download | dotty-9a90e8167f4694576670a5943ec147757b460af5.tar.gz dotty-9a90e8167f4694576670a5943ec147757b460af5.tar.bz2 dotty-9a90e8167f4694576670a5943ec147757b460af5.zip | |
Handle WildcardType in liftToClasses
Diffstat (limited to 'src/dotty/tools/dotc')
| -rw-r--r-- | src/dotty/tools/dotc/printing/PlainPrinter.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Implicits.scala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala index d1a0560f2..880804b9e 100644 --- a/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -202,7 +202,7 @@ class PlainPrinter(_ctx: Context) extends Printer { case AnnotatedType(tpe, annot) => toTextLocal(tpe) ~ " " ~ toText(annot) case HKApply(tycon, args) => - toTextLocal(tycon) ~ "[!" ~ Text(args.map(argText), ", ") ~ "]" + toTextLocal(tycon) ~ "[" ~ Text(args.map(argText), ", ") ~ "]" case tp: TypeVar => if (tp.isInstantiated) toTextLocal(tp.instanceOpt) ~ "'" // debug for now, so that we can see where the TypeVars are. diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala index d3f9fd777..91a67de9a 100644 --- a/src/dotty/tools/dotc/typer/Implicits.scala +++ b/src/dotty/tools/dotc/typer/Implicits.scala @@ -295,6 +295,7 @@ trait ImplicitRunInfo { self: RunInfo => case tp: HKApply => def applyArg(arg: Type) = arg match { case TypeBounds(lo, hi) => AndType.make(lo, hi) + case _: WildcardType => defn.AnyType case _ => arg } (apply(tp.tycon) /: tp.args)((tc, arg) => AndType.make(tc, applyArg(arg))) |