From 75ac4010609c7d3ac856523d8f2d59e710a4c58c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 26 Oct 2015 09:36:59 +0100 Subject: Shorten ctx.typerState.reporter to ctx.reporter ... making use of method in `ctx`. --- src/dotty/tools/dotc/typer/Applications.scala | 2 +- src/dotty/tools/dotc/typer/Implicits.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dotty/tools/dotc/typer') 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)) { -- cgit v1.2.3