Use identity and remove unnecessary param

This does not change semantics.
scalacenter · Jun 20, 2017 · fd0d2d5 · fd0d2d5
1 parent 866d9fd
commit fd0d2d5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/AnalyzingCompiler.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/AnalyzingCompiler.scala
@@ -67,7 +67,7 @@ final class AnalyzingCompiler(
     val compArgs = new CompilerArguments(scalaInstance, classpathOptions)
     val arguments = compArgs(Nil, classpath, None, options)
     val output = CompileOutput(singleOutput)
-    val reporter = new LoggerReporter(maximumErrors, log, p => p)
+    val reporter = new LoggerReporter(maximumErrors, log)
     val progress = Optional.empty[CompileProgress]
     compile(sources, changes, arguments.toArray, output, callback, reporter, cache, log, progress)
   }

diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/LoggerReporter.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/LoggerReporter.scala
@@ -54,12 +54,11 @@ object LoggerReporter {
   lazy val problemStringFormats: ProblemStringFormats = new ProblemStringFormats {}
 }
 
-class LoggerReporter(maximumErrors: Int,
-                     logger: ManagedLogger,
-                     sourcePositionMapper: Position => Position = { p =>
-                       p
-                     })
-    extends Reporter {
+class LoggerReporter(
+    maximumErrors: Int,
+    logger: ManagedLogger,
+    sourcePositionMapper: Position => Position = identity[Position]
+) extends Reporter {
   val positions = new mutable.HashMap[PositionKey, Severity]
   val count = new EnumMap[Severity, Int](classOf[Severity])
   private[this] val allProblems = new mutable.ListBuffer[Problem]
@@ -75,6 +74,7 @@ class LoggerReporter(maximumErrors: Int,
     positions.clear()
     allProblems.clear()
   }
+
   def hasWarnings = count.get(Warn) > 0
   def hasErrors = count.get(Error) > 0
   def problems: Array[Problem] = allProblems.toArray

diff --git a/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala b/internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala
@@ -386,7 +386,7 @@ case class ProjectStructure(
     // to specify it in the incremental option property file (this is the default for sbt)
     val incOptionsFile = baseDirectory / "incOptions.properties"
     val (incOptions, scalacOptions) = loadIncOptions(incOptionsFile)
-    val reporter = new LoggerReporter(maxErrors, scriptedLog, identity)
+    val reporter = new LoggerReporter(maxErrors, scriptedLog)
     val extra = Array(t2(("key", "value")))
     val setup = compiler.setup(lookup,
                                skip = false,

diff --git a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala
@@ -110,7 +110,7 @@ class BaseCompilerSpec extends BridgeProviderSpecification {
     val cs = compiler.compilers(si, ClasspathOptionsUtil.boot, None, sc)
 
     val lookup = MockedLookup(Function.const(Optional.empty[CompileAnalysis]))
-    val reporter = new LoggerReporter(maxErrors, log, identity)
+    val reporter = new LoggerReporter(maxErrors, log)
     val extra = Array(InterfaceUtil.t2(("key", "value")))
 
     var lastCompiledUnits: Set[String] = Set.empty

diff --git a/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala b/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala
@@ -73,7 +73,7 @@ class MultiProjectIncrementalSpec extends BridgeProviderSpecification {
           def externalClassFileManager: Optional[ClassFileManager] = Optional.empty()
         })
 
-      val reporter = new LoggerReporter(maxErrors, log, identity)
+      val reporter = new LoggerReporter(maxErrors, log)
       val setup = compiler.setup(lookup,
                                  skip = false,
                                  cacheFile,