diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-06-28 00:24:09 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-07-01 13:30:44 +0200 |
| commit | a8f9c2e63f65643ef211c3ba9fede8233575a79d (patch) | |
| tree | 86080fda90e9e28ca9219ebc89cf3b7b9257cf43 /src | |
| parent | f5a18b5afaf866134a49af167db707a52044ea99 (diff) | |
| download | scala-a8f9c2e63f65643ef211c3ba9fede8233575a79d.tar.gz scala-a8f9c2e63f65643ef211c3ba9fede8233575a79d.tar.bz2 scala-a8f9c2e63f65643ef211c3ba9fede8233575a79d.zip | |
SI-7591 Minor cleanups
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/cmd/Spec.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/util/parsing/combinator/Parsers.scala | 4 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 11 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/compiler/scala/tools/cmd/Spec.scala b/src/compiler/scala/tools/cmd/Spec.scala index b761601167..a1cb31f911 100644 --- a/src/compiler/scala/tools/cmd/Spec.scala +++ b/src/compiler/scala/tools/cmd/Spec.scala @@ -15,7 +15,7 @@ trait Spec { def programInfo: Spec.Info protected def help(str: => String): Unit - protected def heading(str: => String): Unit = help("\n " + str) + protected def heading(str: => String): Unit = help(s"\n $str") type OptionMagic <: Opt.Implicit protected implicit def optionMagicAdditions(s: String): OptionMagic diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/library/scala/util/parsing/combinator/Parsers.scala index 4602c3cc53..16754646fd 100644 --- a/src/library/scala/util/parsing/combinator/Parsers.scala +++ b/src/library/scala/util/parsing/combinator/Parsers.scala @@ -531,10 +531,6 @@ trait Parsers { } } - /*trait ElemFun - case class EFCons(hd: Elem => ElemFun, tl: ElemFun) extends ElemFun - case class EFNil(res: Boolean) extends ElemFun*/ - /** A parser matching input elements that satisfy a given predicate. * * `elem(kind, p)` succeeds if the input starts with an element `e` for which `p(e)` is true. diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala index a53698eb77..d7d87bdcf5 100644 --- a/src/partest/scala/tools/partest/nest/Runner.scala +++ b/src/partest/scala/tools/partest/nest/Runner.scala @@ -772,15 +772,8 @@ trait DirectRunner { import PartestDefaults.{ numThreads, waitTime } - Thread.setDefaultUncaughtExceptionHandler( - new Thread.UncaughtExceptionHandler { - def uncaughtException(thread: Thread, t: Throwable) { - val t1 = Exceptional unwrap t - System.err.println(s"Uncaught exception on thread $thread: $t1") - t1.printStackTrace() - } - } - ) + setUncaughtHandler + def runTestsForFiles(kindFiles: List[File], kind: String): List[TestState] = { NestUI.resetTestNumber(kindFiles.size) |