no postfixops in scaladoc

Author: som-snytt

src/scaladoc/scala/tools/nsc/doc/Settings.scala

@@ -14,7 +14,6 @@ package scala.tools.nsc
 package doc
 
 import java.io.File
-import scala.language.postfixOps
 
 /** An extended version of compiler settings, with additional Scaladoc-specific options.
   * @param error A function that prints a string to the appropriate error stream
@@ -68,7 +67,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
 
   lazy val uncompilableFiles = docUncompilable.value match {
     case ""     => Nil
-    case path   => io.Directory(path).deepFiles filter (_ hasExtension "scala") toList
+    case path   => io.Directory(path).deepFiles.filter(_ hasExtension "scala").toList
   }
 
   /** A setting that defines a URL to be concatenated with source locations and show a link to source files.
@@ -257,7 +256,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
 
   def stripIndex(url: String): String = url.stripSuffix("index.html").stripSuffix("/") + "/"
 
-  lazy val extUrlMapping: Map[String, String] = docExternalDoc.value flatMap { s =>
+  lazy val extUrlMapping: Map[String, String] = docExternalDoc.value.flatMap { s =>
     val idx = s.indexOf("#")
     if (idx > 0) {
       val (first, last) = s.splitAt(idx)
@@ -266,7 +265,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
       error(s"Illegal -doc-external-doc option; expected a pair with '#' separator, found: '$s'")
       None
     }
-  } toMap
+  }.toMap
 
   /**
    *  This is the hardcoded area of Scaladoc. This is where "undesirable" stuff gets eliminated. I know it's not pretty,

src/scaladoc/scala/tools/nsc/doc/Uncompilable.scala

@@ -13,7 +13,6 @@
 package scala.tools.nsc
 package doc
 import scala.language.implicitConversions
-import scala.language.postfixOps
 
 /** Some glue between DocParser (which reads source files which can't be compiled)
  *  and the scaladoc model.
@@ -42,7 +41,7 @@ trait Uncompilable {
   }
   def files     = settings.uncompilableFiles
   def symbols   = pairs map (_._1)
-  def templates = symbols filter (x => x.isClass || x.isTrait || x == AnyRefClass/* which is now a type alias */) toSet
+  def templates = symbols.filter(x => x.isClass || x.isTrait || x == AnyRefClass/* which is now a type alias */).toSet
   def comments = {
     if (settings.debug || settings.verbose)
       inform("Found %d uncompilable files: %s".format(files.size, files mkString ", "))

src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala

@@ -19,8 +19,6 @@ import scala.annotation.tailrec
 import scala.collection._
 import scala.util.matching.Regex
 import scala.reflect.internal.util.Position
-import scala.language.postfixOps
-
 
 /** The comment parser transforms raw comment strings into `Comment` objects.
   * Call `parse` to run the parser. Note that the parser is stateless and

src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala

@@ -22,7 +22,6 @@ import model.diagram._
 import page.diagram._
 
 import scala.collection.mutable
-import scala.language.postfixOps
 import scala.reflect.internal.Reporter
 
 trait EntityPage extends HtmlPage {
@@ -166,7 +165,7 @@ trait EntityPage extends HtmlPage {
        )
 
   val valueMembers =
-    tpl.methods ++ tpl.values ++ tpl.templates.filter(x => x.isObject) sorted
+    (tpl.methods ++ tpl.values ++ tpl.templates.filter(x => x.isObject)).sorted
 
   val (absValueMembers, nonAbsValueMembers) =
     valueMembers partition (_.isAbstract)
@@ -509,7 +508,7 @@ trait EntityPage extends HtmlPage {
             // see ImplicitMemberShadowing trait for more information
             val shadowingSuggestion = {
               val params = mbr match {
-                case d: Def => d.valueParams map (_ map (_ name) mkString("(", ", ", ")")) mkString
+                case d: Def => d.valueParams.map(_.map(_.name).mkString("(", ", ", ")")).mkString
                 case _      => "" // no parameters
               }
               Br ++ Txt("To access this member you can use a ") ++