summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/plugins
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-04-29 14:27:35 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-04-29 14:27:35 +0000
commit6c1feb586bc3687ee08d2395233c849550530ba7 (patch)
treec096fabdfd9879ea11f3f7ee6646af9c20e0e4ef /src/compiler/scala/tools/nsc/plugins
parentcc60527405d5adc5e007b7254a8d915b79308fcc (diff)
downloadscala-6c1feb586bc3687ee08d2395233c849550530ba7.tar.gz
scala-6c1feb586bc3687ee08d2395233c849550530ba7.tar.bz2
scala-6c1feb586bc3687ee08d2395233c849550530ba7.zip
remove now redundant check (see #4426).
Diffstat (limited to 'src/compiler/scala/tools/nsc/plugins')
-rw-r--r--src/compiler/scala/tools/nsc/plugins/Plugins.scala8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
index 64e38fee9a..36227c1052 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
@@ -105,12 +105,8 @@ trait Plugins {
* Extract all phases supplied by plugins and add them to the phasesSet.
* @see phasesSet
*/
- protected def computePluginPhases(): Unit = {
- // For reasons not yet apparent to me, plugins started appearing
- // as null when I added phaseTimings to global.
- if (plugins != null)
- phasesSet ++= (plugins flatMap (_.components))
- }
+ protected def computePluginPhases(): Unit =
+ phasesSet ++= (plugins flatMap (_.components))
/** Summary of the options for all loaded plugins */
def pluginOptionsHelp: String =