diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-21 09:55:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 09:55:18 +0200 |
| commit | 5f894c06da97fdcebf206ac41b4694beb7b27a05 (patch) | |
| tree | feb13364f578c3acd00eeaaecf85f03dd14c1ff3 /src/repl/scala/tools/nsc/MainGenericRunner.scala | |
| parent | 5b8e4d3436b4b22d67b99e37573957554f151dd9 (diff) | |
| parent | 94518ce0be2ffdb06d1d3f81279fdc05fa568c0b (diff) | |
| download | scala-5f894c06da97fdcebf206ac41b4694beb7b27a05.tar.gz scala-5f894c06da97fdcebf206ac41b4694beb7b27a05.tar.bz2 scala-5f894c06da97fdcebf206ac41b4694beb7b27a05.zip | |
Merge pull request #5393 from som-snytt/issue/nowarn-thistype-discard
No warn when discarding r.f(): r.type
Diffstat (limited to 'src/repl/scala/tools/nsc/MainGenericRunner.scala')
| -rw-r--r-- | src/repl/scala/tools/nsc/MainGenericRunner.scala | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/repl/scala/tools/nsc/MainGenericRunner.scala b/src/repl/scala/tools/nsc/MainGenericRunner.scala index a09e797e07..894157ff6c 100644 --- a/src/repl/scala/tools/nsc/MainGenericRunner.scala +++ b/src/repl/scala/tools/nsc/MainGenericRunner.scala @@ -49,10 +49,6 @@ class MainGenericRunner { def isI = !settings.loadfiles.isDefault def dashi = settings.loadfiles.value - // Deadlocks on startup under -i unless we disable async. - if (isI) - settings.Yreplsync.value = true - def combinedCode = { val files = if (isI) dashi map (file => File(file).slurp()) else Nil val str = if (isE) List(dashe) else Nil @@ -98,7 +94,7 @@ class MainGenericRunner { if (!command.ok) errorFn(f"%n$shortUsageMsg") else if (shouldStopWithInfo) - errorFn(command getInfoMessage sampleCompiler, isFailure = false) + errorFn(command.getInfoMessage(sampleCompiler), isFailure = false) else run() } |