diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-12 19:32:10 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-12 19:32:10 +0000 |
commit | b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27 (patch) | |
tree | 207c19eafeba624a0d706aedccd05461585dd0d3 /src/compiler | |
parent | 236f61c04c9bd3f4bb8651c0bd2fe1ac8c663095 (diff) | |
download | scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.tar.gz scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.tar.bz2 scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.zip |
Some modifications to @elidable: for reasons lo...
Some modifications to @elidable: for reasons lost to me now it had a
default value such that annotated methods might be elided even if the
option wasn't given. It now does nothing in that situation. Closes
#4051, #4151, no review.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index f9d0d4034c..44bd03d14f 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -46,8 +46,8 @@ trait ScalaSettings extends AbsScalaSettings with StandardScalaSettings { val sourcedir = StringSetting ("-Xsourcedir", "directory", "(Requires -target:msil) Mirror source folder structure in output directory.", ".").dependsOn(target, "msil") val checkInit = BooleanSetting ("-Xcheckinit", "Wrap field accessors to throw an exception on uninitialized access.") val noassertions = BooleanSetting ("-Xdisable-assertions", "Generate no assertions or assumptions.") - val elidebelow = IntSetting ("-Xelide-below", "Generate calls to @elidable-marked methods only if method priority is greater than argument.", - elidable.ASSERTION, None, elidable.byName.get(_)) + val elidebelow = IntSetting ("-Xelide-below", "Calls to @elidable methods are omitted if method priority is lower than argument", + elidable.MINIMUM, None, elidable.byName get _) val noForwarders = BooleanSetting ("-Xno-forwarders", "Do not generate static forwarders in mirror classes.") val future = BooleanSetting ("-Xfuture", "Turn on future language features.") val genPhaseGraph = StringSetting ("-Xgenerate-phase-graph", "file", "Generate the phase graphs (outputs .dot files) to fileX.dot.", "") |