diff options
| author | odersky <odersky@gmail.com> | 2016-12-15 17:44:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 17:44:06 +0100 |
| commit | a5620ab882b95ef60acf42814ac5568d5f93bdd4 (patch) | |
| tree | a524a250769cd72ebb316c30b8166c4c45d7fc43 /compiler/src/dotty/tools/dotc/core | |
| parent | 9f2b5ad068c06c62e28a3543218f5c1bc0362f74 (diff) | |
| parent | bc869e74cb18ffdb4d42b59ad654f55403b9b6bd (diff) | |
| download | dotty-a5620ab882b95ef60acf42814ac5568d5f93bdd4.tar.gz dotty-a5620ab882b95ef60acf42814ac5568d5f93bdd4.tar.bz2 dotty-a5620ab882b95ef60acf42814ac5568d5f93bdd4.zip | |
Merge pull request #1785 from dotty-staging/fix-#1784
Fix #1784: allow to omit types for local implicit vals
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/SymDenotations.scala | 2 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 4 | ||||
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/Types.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 8b7c28e19..e2bb0ac1a 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -75,7 +75,7 @@ trait SymDenotations { this: Context => def explainSym(msg: String) = explain(s"$msg\n defined = ${denot.definedPeriodsString}") if (denot.is(ValidForever) || denot.isRefinementClass) true else { - implicit val ctx: Context = this + implicit val ctx = this val initial = denot.initial if ((initial ne denot) || ctx.phaseId != initial.validFor.firstPhaseId) { ctx.withPhase(initial.validFor.firstPhaseId).traceInvalid(initial) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index f8c0cdac9..743220f55 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -16,7 +16,7 @@ import scala.util.control.NonFatal /** Provides methods to compare types. */ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { - implicit val ctx: Context = initctx + implicit val ctx = initctx val state = ctx.typerState import state.constraint @@ -156,7 +156,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { private def firstTry(tp1: Type, tp2: Type): Boolean = tp2 match { case tp2: NamedType => def compareNamed(tp1: Type, tp2: NamedType): Boolean = { - implicit val ctx: Context = this.ctx + implicit val ctx = this.ctx tp2.info match { case info2: TypeAlias => isSubType(tp1, info2.alias) case _ => tp1 match { diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 7e6620f8e..4dffc4542 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -3378,7 +3378,7 @@ object Types { /** Map this function over given type */ def mapOver(tp: Type): Type = { - implicit val ctx: Context = this.ctx // Dotty deviation: implicits need explicit type + implicit val ctx = this.ctx tp match { case tp: NamedType => if (stopAtStatic && tp.symbol.isStatic) tp |