diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 89eb6f2e91..976fcc8f7c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1277,7 +1277,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { if (context.unit.source.file == psym.sourceFile || isValueClass(context.owner)) psym addChild context.owner else - error(parent.pos, "illegal inheritance from sealed "+psym+": " + context.unit.source.file + " != " + psym.sourceFile) + error(parent.pos, "illegal inheritance from sealed "+psym+": " + context.unit.source.file.canonicalPath + " != " + psym.sourceFile.canonicalPath) } if (!(selfType <:< parent.tpe.typeOfThis) && !phase.erasedTypes && diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index a8900e115d..45902229eb 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -578,6 +578,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor val dir = file.getParentFile // diff is contents of logFile + fileManager.mapFile(logFile, replaceSlashes(dir, _)) diffCheck(compareOutput(dir, logFile)) }) |