aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-10-26 09:36:59 +0100
committerMartin Odersky <odersky@gmail.com>2015-10-26 09:38:28 +0100
commit75ac4010609c7d3ac856523d8f2d59e710a4c58c (patch)
treea3e3a56fe8f837836ed2129d6f711527bbb82fea /src/dotty/tools/dotc/typer
parent51ab200f97f11ac74270f6925028ba4d58284e7b (diff)
downloaddotty-75ac4010609c7d3ac856523d8f2d59e710a4c58c.tar.gz
dotty-75ac4010609c7d3ac856523d8f2d59e710a4c58c.tar.bz2
dotty-75ac4010609c7d3ac856523d8f2d59e710a4c58c.zip
Shorten ctx.typerState.reporter to ctx.reporter
... making use of method in `ctx`.
Diffstat (limited to 'src/dotty/tools/dotc/typer')
-rw-r--r--src/dotty/tools/dotc/typer/Applications.scala2
-rw-r--r--src/dotty/tools/dotc/typer/Implicits.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index 87ad0831c..0fee17bcd 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -153,7 +153,7 @@ trait Applications extends Compatibility { self: Typer =>
def ok = _ok
def ok_=(x: Boolean) = {
- assert(x || ctx.errorsReported || !ctx.typerState.isCommittable) // !!! DEBUG
+ assert(x || ctx.reporter.errorsReported || !ctx.typerState.isCommittable) // !!! DEBUG
_ok = x
}
diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala
index 5444dddb0..e3626fe20 100644
--- a/src/dotty/tools/dotc/typer/Implicits.scala
+++ b/src/dotty/tools/dotc/typer/Implicits.scala
@@ -495,7 +495,7 @@ trait Implicits { self: Typer =>
case _ => false
}
}
- if (ctx.typerState.reporter.hasErrors)
+ if (ctx.reporter.hasErrors)
nonMatchingImplicit(ref)
else if (contextual && !ctx.mode.is(Mode.ImplicitShadowing) &&
!shadowing.tpe.isError && !refMatches(shadowing)) {