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/compiler/scala/tools/nsc/settings/ScalaSettings.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/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 4f0a4c8a46..5eb99e0d98 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -38,11 +38,8 @@ trait ScalaSettings extends AbsScalaSettings /** If any of these settings is enabled, the compiler should print a message and exit. */ def infoSettings = List[Setting](version, help, Xhelp, Yhelp, showPlugins, showPhases, genPhaseGraph) - /** Any -option:help? */ - private def multihelp = allSettings exists { case s => s.isHelping case _ => false } - - /** Is an info setting set? */ - def isInfo = (infoSettings exists (_.isSetByUser)) || multihelp + /** Is an info setting set? Any -option:help? */ + def isInfo = infoSettings.exists(_.isSetByUser) || allSettings.exists(_.isHelping) /** Disable a setting */ def disable(s: Setting) = allSettings -= s |