diff options
| -rw-r--r-- | src/dotty/tools/dotc/typer/Checking.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Namer.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/RefChecks.scala | 3 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/src/dotty/tools/dotc/typer/Checking.scala index f7502d56d..b8b4c9d2c 100644 --- a/src/dotty/tools/dotc/typer/Checking.scala +++ b/src/dotty/tools/dotc/typer/Checking.scala @@ -232,7 +232,8 @@ trait Checking { /** Check that type `tp` is stable. */ def checkStable(tp: Type, pos: Position)(implicit ctx: Context): Unit = - if (!tp.isStable) ctx.error(d"$tp is not stable", pos) + if (!tp.isStable) + ctx.error(d"$tp is not stable", pos) /** Check that type `tp` is a legal prefix for '#'. * @return The type itself diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala index 414f6e517..7cca608e6 100644 --- a/src/dotty/tools/dotc/typer/Namer.scala +++ b/src/dotty/tools/dotc/typer/Namer.scala @@ -411,7 +411,7 @@ class Namer { typer: Typer => case _ => } } - for (mdef @ ModuleDef(name, _) <- stats) { + for (mdef @ ModuleDef(name, _) <- stats if !mdef.mods.is(Flags.Package)) { val typName = name.toTypeName val Thicket(vdef :: (mcls @ TypeDef(_, impl: Template)) :: Nil) = mdef.attachment(ExpandedTree) moduleDef(typName) = mcls diff --git a/src/dotty/tools/dotc/typer/RefChecks.scala b/src/dotty/tools/dotc/typer/RefChecks.scala index 0ccb589ac..8a778a38d 100644 --- a/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/src/dotty/tools/dotc/typer/RefChecks.scala @@ -395,7 +395,8 @@ object RefChecks { for (member <- missing) { val memberSym = member.symbol - def undefined(msg: String) = abstractClassError(false, member.showDcl + " is not defined" + msg) + def undefined(msg: String) = + abstractClassError(false, member.showDcl + " is not defined" + msg) val underlying = memberSym.underlyingSymbol // Give a specific error message for abstract vars based on why it fails: diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 2a1ef08ee..9294389b1 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -149,7 +149,7 @@ class tests extends CompilerTest { @Test def dotc_printing = compileDir(dotcDir + "tools/dotc/printing") - @Test def dotc_reporting = compileDir(dotcDir + "tools/dotc/reporting", twice) + @Test def dotc_reporting = compileDir(dotcDir + "tools/dotc/reporting") @Test def dotc_typer = compileDir(dotcDir + "tools/dotc/typer", failedOther) // error: error while loading Checking$$anon$2$, |