diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-08 18:39:24 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-08 18:39:24 +0100 |
| commit | 5e0dc87e7c124ccd0a4b3456e16756844cee4fd9 (patch) | |
| tree | 7862a8e6a91c252fa9bbc22cc135940af56b7652 | |
| parent | db4ef5b78be2fb7f954d82a972ab70df28acccfa (diff) | |
| download | scala-5e0dc87e7c124ccd0a4b3456e16756844cee4fd9.tar.gz scala-5e0dc87e7c124ccd0a4b3456e16756844cee4fd9.tar.bz2 scala-5e0dc87e7c124ccd0a4b3456e16756844cee4fd9.zip | |
Address review comments
- anonymize unused pattern binder
- avoid negations
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/transform/Erasure.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 57f3da839a..6fe0f34105 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -1043,7 +1043,7 @@ abstract class Erasure extends AddInterfaces case Literal(ct) if ct.tag == ClazzTag && ct.typeValue.typeSymbol != definitions.UnitClass => val erased = ct.typeValue match { - case tr @ TypeRef(pre, clazz, args) if clazz.isDerivedValueClass => scalaErasure.eraseNormalClassRef(tr) + case tr @ TypeRef(_, clazz, _) if clazz.isDerivedValueClass => scalaErasure.eraseNormalClassRef(tr) case tpe => specialScalaErasure(tpe) } treeCopy.Literal(tree, Constant(erased)) diff --git a/src/reflect/scala/reflect/internal/transform/Erasure.scala b/src/reflect/scala/reflect/internal/transform/Erasure.scala index 6a6668ed05..addc7eb389 100644 --- a/src/reflect/scala/reflect/internal/transform/Erasure.scala +++ b/src/reflect/scala/reflect/internal/transform/Erasure.scala @@ -74,7 +74,7 @@ trait Erasure { // // This requires that cls.isClass. protected def rebindInnerClass(pre: Type, cls: Symbol): Type = - if (!cls.isTopLevel && !cls.isLocal) cls.owner.tpe_* else pre + if (cls.isTopLevel || cls.isLocal) pre else cls.owner.tpe_* /** The type of the argument of a value class reference after erasure * This method needs to be called at a phase no later than erasurephase |