diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-06-25 22:38:20 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-06-25 22:38:20 +0200 |
| commit | e984e232bb21c8b24f7f591239afd1672fcf504e (patch) | |
| tree | 062227fc58c1f9f0947c5728231ca70406e2e919 /src/dotty/tools/dotc/typer/Typer.scala | |
| parent | 1e9ffd45ed3c7782ae2f21ed0361e776a122897b (diff) | |
| download | dotty-e984e232bb21c8b24f7f591239afd1672fcf504e.tar.gz dotty-e984e232bb21c8b24f7f591239afd1672fcf504e.tar.bz2 dotty-e984e232bb21c8b24f7f591239afd1672fcf504e.zip | |
Cleanups
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 02b740dd3..479eedd38 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1292,11 +1292,11 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit def followAlias(tp: Type)(implicit ctx: Context): Type = { val constraint = ctx.typerState.constraint def inst(tp: Type): Type = tp match { - case TypeBounds(lo, hi) => - if ((lo eq hi) || (hi <:< lo)(ctx.fresh.setExploreTyperState)) inst(lo) else NoType + case TypeBounds(lo, hi) + if (lo eq hi) || (hi <:< lo)(ctx.fresh.setExploreTyperState) => + inst(lo) case tp: PolyParam => - var tvar1 = constraint.typeVarOfParam(tp) - if (tvar1.exists) tvar1 else tp + constraint.typeVarOfParam(tp).orElse(tp) case _ => tp } tp match { |