diff options
| author | Paul Phillips <paulp@improving.org> | 2010-01-19 03:15:07 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-01-19 03:15:07 +0000 |
| commit | 41e80159b37d8a07922fb90d516b9105f2f185b7 (patch) | |
| tree | 98db148b7e9cb61f54d483e0b61430bdbb9b6141 /src/compiler/scala/tools/nsc/CompilerCommand.scala | |
| parent | 135d4f06b174aa585af64b5253aba647982ac4a2 (diff) | |
| download | scala-41e80159b37d8a07922fb90d516b9105f2f185b7.tar.gz scala-41e80159b37d8a07922fb90d516b9105f2f185b7.tar.bz2 scala-41e80159b37d8a07922fb90d516b9105f2f185b7.zip | |
Digging into why the repl is so slow, discovere...
Digging into why the repl is so slow, discovered that fsc is once again
never reusing compiler instances (but for a different reason than
#1683.) Small changes break equality and the little troopers are so darn
quiet about it. Steady state, hot fsc repl startup times before this
patch:
0m1.747s 0m1.789s 0m1.842s 0m1.690s
After this patch:
0m1.139s 0m1.148s 0m1.090s 0m1.091s
No review. Could use a test case but I have trouble coaxing partest this
far outside the box.
Diffstat (limited to 'src/compiler/scala/tools/nsc/CompilerCommand.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompilerCommand.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala index 8465227133..75a3414d75 100644 --- a/src/compiler/scala/tools/nsc/CompilerCommand.scala +++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala @@ -33,7 +33,7 @@ class CompilerCommand( val cmdName = "scalac" private val helpSyntaxColumnWidth: Int = - (settings.allSettings map (_.helpSyntax.length)) max + (settings.settingSet map (_.helpSyntax.length)) max private def format(s: String): String = { val buf = new StringBuilder(s) @@ -44,7 +44,7 @@ class CompilerCommand( /** Creates a help message for a subset of options based on cond */ def createUsageMsg(label: String, cond: (Setting) => Boolean): String = - settings.allSettings . + settings.settingSet . filter(cond) . map(s => format(s.helpSyntax) + " " + s.helpDescription) . mkString("Usage: %s <options> <source files>\n%s options include:\n " . |