diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-07-20 10:36:53 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-09-18 18:10:39 +0200 |
| commit | 2634498cede2525b07c1e40fbad0f5ae0cf96fda (patch) | |
| tree | f4f24517a670557bc9a85433a72bffafc167680c /src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | |
| parent | caae19ba37b7b05b2fd2e1edbad62ee9bf46c5e4 (diff) | |
| download | dotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.tar.gz dotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.tar.bz2 dotty-2634498cede2525b07c1e40fbad0f5ae0cf96fda.zip | |
Rename Apply -> hkApply
Want to have a unique name for Apply, so that tests for higher-kinded types become cheaper.
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index 68439846d..af33ce3c2 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -584,7 +584,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas * tp { name: T } */ def elimExistentials(boundSyms: List[Symbol], tp: Type)(implicit ctx: Context): Type = { - // Need to be careful not to run into cyclic references here (observed when + // Need to be careful not to run into cyclic references here (observed when // comiling t247.scala). That's why we avoiud taking `symbol` of a TypeRef // unless names match up. val isBound = (tp: Type) => { @@ -619,7 +619,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas case info => tp.derivedRefinedType(parent1, name, info) } - case tp @ TypeRef(pre, tpnme.Apply) if pre.isLambda => + case tp @ TypeRef(pre, tpnme.hkApply) => elim(pre) case _ => tp |