Skip to content

Commit 4addec0

Browse files
committed
Change Driver API to not need definition of newCompiler
1 parent 31a4810 commit 4addec0

File tree

6 files changed

+4
-14
lines changed

6 files changed

+4
-14
lines changed

compiler/src/dotty/tools/dotc/Bench.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ object Bench extends Driver {
1616

1717
@sharable private var numRuns = 1
1818

19-
def newCompiler(implicit ctx: Context): Compiler = new Compiler
20-
2119
private def ntimes(n: Int)(op: => Reporter): Reporter =
2220
(emptyReporter /: (0 until n)) ((_, _) => op)
2321

compiler/src/dotty/tools/dotc/Driver.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import scala.util.control.NonFatal
1313
* process, but in most cases you only need to call [[process]] on the
1414
* existing object [[Main]].
1515
*/
16-
abstract class Driver extends DotClass {
16+
class Driver extends DotClass {
1717

18-
protected def newCompiler(implicit ctx: Context): Compiler
18+
protected def newCompiler(implicit ctx: Context): Compiler = new Compiler
1919

2020
protected def emptyReporter: Reporter = new StoreReporter(null)
2121

compiler/src/dotty/tools/dotc/Main.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ package dotc
44
import core.Contexts.Context
55

66
/** Main class of the `dotc` batch compiler. */
7-
object Main extends Driver {
8-
override def newCompiler(implicit ctx: Context): Compiler = new Compiler
9-
}
7+
object Main extends Driver

compiler/src/dotty/tools/dotc/Resident.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class Resident extends Driver {
2727

2828
object residentCompiler extends Compiler
2929

30-
override def newCompiler(implicit ctx: Context): Compiler = ???
31-
3230
override def sourcesRequired = false
3331

3432
private val quit = ":q"

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class InteractiveDriver(settings: List[String]) extends Driver {
2828
import tpd._
2929
import InteractiveDriver._
3030

31-
// FIXME: Change the Driver API to not require implementing this method
32-
override protected def newCompiler(implicit ctx: Context): Compiler = ???
3331
override def sourcesRequired = false
3432

3533
private val myInitCtx: Context = {

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
373373
if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
374374

375375
val driver =
376-
if (times == 1) new Driver { def newCompiler(implicit ctx: Context) = new Compiler }
376+
if (times == 1) new Driver
377377
else new Driver {
378-
def newCompiler(implicit ctx: Context) = new Compiler
379-
380378
private def ntimes(n: Int)(op: Int => Reporter): Reporter =
381379
(emptyReporter /: (1 to n)) ((_, i) => op(i))
382380

0 commit comments

Comments
 (0)