From b5bdfab87b9be2cfbbc67370d1b6fbb5eb374098 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 5 Mar 2017 20:15:20 +0900 Subject: Add FatalError from scala.reflect --- compiler/src/dotty/tools/FatalError.scala | 3 +++ compiler/src/dotty/tools/package.scala | 3 --- compiler/test/dotty/partest/DPConsoleRunner.scala | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 compiler/src/dotty/tools/FatalError.scala (limited to 'compiler') diff --git a/compiler/src/dotty/tools/FatalError.scala b/compiler/src/dotty/tools/FatalError.scala new file mode 100644 index 000000000..f75d5cf12 --- /dev/null +++ b/compiler/src/dotty/tools/FatalError.scala @@ -0,0 +1,3 @@ +package dotty.tools + +case class FatalError(msg: String) extends Exception(msg) diff --git a/compiler/src/dotty/tools/package.scala b/compiler/src/dotty/tools/package.scala index 5dae82b71..68d24e229 100644 --- a/compiler/src/dotty/tools/package.scala +++ b/compiler/src/dotty/tools/package.scala @@ -2,9 +2,6 @@ package dotty import scala.annotation.Annotation package object tools { - type FatalError = scala.reflect.internal.FatalError - val FatalError = scala.reflect.internal.FatalError - class sharable extends Annotation class unshared extends Annotation diff --git a/compiler/test/dotty/partest/DPConsoleRunner.scala b/compiler/test/dotty/partest/DPConsoleRunner.scala index 7a25af6b7..aa926efe2 100644 --- a/compiler/test/dotty/partest/DPConsoleRunner.scala +++ b/compiler/test/dotty/partest/DPConsoleRunner.scala @@ -4,6 +4,7 @@ package dotty.partest +import dotty.tools.FatalError import scala.reflect.io.AbstractFile import scala.tools.partest._ import scala.tools.partest.nest._ @@ -294,8 +295,6 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn // override to add the check for nr of compilation errors if there's a // target.nerr file override def runNegTest() = runInContext { - import scala.reflect.internal.FatalError - sealed abstract class NegTestState // Don't get confused, the neg test passes when compilation fails for at // least one round (optionally checking the number of compiler errors and -- cgit v1.2.3