diff options
author | Martin Odersky <odersky@gmail.com> | 2015-11-08 10:33:58 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-11-09 15:45:40 +0100 |
commit | 4f01f62ac216fa9034d343828aa6f4be626d9b36 (patch) | |
tree | 9a0dbba0554183199aa3f1389e7e166851073bb8 /src/dotty/tools/dotc/core/TypeErasure.scala | |
parent | 2d7a05fa46016ea54e10a80735e04b33fd0938d1 (diff) | |
download | dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.gz dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.tar.bz2 dotty-4f01f62ac216fa9034d343828aa6f4be626d9b36.zip |
Shorten ..Class.typeRef to ..Type
Since we now have two forms of (almost) everything in Definitions,
might as well profit from it.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeErasure.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/TypeErasure.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TypeErasure.scala b/src/dotty/tools/dotc/core/TypeErasure.scala index b76dd869a..8f116c85f 100644 --- a/src/dotty/tools/dotc/core/TypeErasure.scala +++ b/src/dotty/tools/dotc/core/TypeErasure.scala @@ -176,7 +176,7 @@ object TypeErasure { else if (sym.isConstructor) outer.addParam(sym.owner.asClass, erase(tp)(erasureCtx)) else erase.eraseInfo(tp, sym)(erasureCtx) match { case einfo: MethodType if sym.isGetter && einfo.resultType.isRef(defn.UnitClass) => - MethodType(Nil, defn.BoxedUnitClass.typeRef) + MethodType(Nil, defn.BoxedUnitType) case einfo => einfo } @@ -360,7 +360,7 @@ class TypeErasure(isJava: Boolean, semiEraseVCs: Boolean, isConstructor: Boolean else classParents.mapConserve(eraseTypeRef) match { case tr :: trs1 => assert(!tr.classSymbol.is(Trait), cls) - val tr1 = if (cls is Trait) defn.ObjectClass.typeRef else tr + val tr1 = if (cls is Trait) defn.ObjectType else tr tr1 :: trs1.filterNot(_ isRef defn.ObjectClass) case nil => nil } |