Scala 2.13.3 + sbt-tpolecat, fix all code for activated linting options (monix#1221)

Author: alexandru

.scalafmt.conf

@@ -1,28 +1,13 @@
 version = "2.6.4"
 
-#
-# See http://scalameta.org/scalafmt/#Configuration for details
-#
-project {
-  includeFilters = [
-    ".*.\\.scala$"
-    ".*\\..sbt$"
-  ]
-}
-
 maxColumn = 120
+docstrings = ScalaDoc
 
-# Vertical alignment, options: none, some, more
-#
-# This awkward, self-contradictory, configuration ensures that only
-# the common sbt tokens get aligned, and not "production" code.
-#
-align = none
-align {
-  openParenCallSite = false
-  openParenDefnSite = false
-  tokens = ["%", ":=", "~=", "<-"]
-}
+project.git = true
+preset = default
+
+# Alignment is cool, until we have to view diffs and solve merge conflicts
+align.preset = none
 
 # If true, the margin character | is aligned with the opening triple quote string literals
 assumeStandardLibraryStripMargin = true
@@ -31,6 +16,11 @@ assumeStandardLibraryStripMargin = true
 #see: http://scalameta.org/scalafmt/#includeCurlyBraceInSelectChains
 includeCurlyBraceInSelectChains = false
 
+rewrite.rules = [
+  SortImports,
+  AvoidInfix,
+]
+
 continuationIndent {
   callSite = 2
   defnSite = 2
@@ -39,7 +29,6 @@ continuationIndent {
 
 danglingParentheses = false
 
-
 newlines {
   alwaysBeforeTopLevelStatements = false
   sometimesBeforeColonInMethodReturnType = true
@@ -61,6 +50,7 @@ optIn {
   breaksInsideChains = false
   breakChainOnFirstMethodDot = true
   configStyleArguments = true
+  blankLineBeforeDocstring = true
 }
 
 runner {
@@ -74,16 +64,4 @@ runner {
   }
 }
 
-rewrite {
-  rules = [
-    SortImports
-    # if your for has more than one single <- then it gets transformed into a multit-line curly brace one
-    # PreferCurlyFors
-  ]
-}
-
-optIn {
-  blankLineBeforeDocstring = true
-}
-
-lineEndings=preserve
+lineEndings=preserve

.travis.yml

@@ -10,49 +10,49 @@ matrix:
       scala: 2.11.12
       env:
         - COMMAND=ci-jvm-mima
-        - SCALAJS_VERSION=0.6.32
+        - SCALAJS_VERSION=0.6.33
     # Scala 2.11, JavaScript
     - jdk: oraclejdk8
       scala: 2.11.12
       env:
         - COMMAND=ci-js
-        - SCALAJS_VERSION=0.6.32
+        - SCALAJS_VERSION=0.6.33
     # Scala 2.12, JVM
     - jdk: oraclejdk8
-      scala: 2.12.10
+      scala: 2.12.12
       env:
         - COMMAND=ci-jvm
         - SCALAJS_VERSION=
     # Scala 2.12, JavaScript
     - jdk: oraclejdk8
-      scala: 2.12.10
+      scala: 2.12.12
       env:
         - COMMAND=ci-js
-        - SCALAJS_VERSION=1.0.0
+        - SCALAJS_VERSION=1.1.1
     # Scala 2.13, JVM
     - jdk: oraclejdk8
-      scala: 2.13.1
+      scala: 2.13.3
       env:
         - COMMAND=ci-jvm-all
         - SCALAJS_VERSION=
     # Scala 2.13, JVM, JDK 11
     - jdk: openjdk11
-      scala: 2.13.1
+      scala: 2.13.3
       env:
         - COMMAND=ci-jvm
         - SCALAJS_VERSION=
-    # Scala 2.13, JavaScript 0.6.32
+    # Scala 2.13, JavaScript 0.6.33
     - jdk: oraclejdk8
-      scala: 2.13.1
+      scala: 2.13.3
       env:
         - COMMAND=ci-js
-        - SCALAJS_VERSION=0.6.32
-    # Scala 2.13, JavaScript 1.0.0
+        - SCALAJS_VERSION=0.6.33
+    # Scala 2.13, JavaScript 1.1.1
     - jdk: oraclejdk8
-      scala: 2.13.1
+      scala: 2.13.3
       env:
         - COMMAND=ci-js
-        - SCALAJS_VERSION=1.0.0
+        - SCALAJS_VERSION=1.1.1
 
 env:
   global:

benchmarks/shared/src/main/scala/monix/benchmarks/ChunkedEvalFilterMapSumBenchmark.scala

@@ -75,7 +75,7 @@ class ChunkedEvalFilterMapSumBenchmark {
   def setup(): Unit = {
     val chunks = (1 to chunkCount).map(i => Array.fill(chunkSize)(i))
     allElements = chunks.flatten
-    expectedSum = allElements.sum
+    expectedSum = allElements.sum.toLong
   }
 
   @Benchmark
@@ -135,6 +135,7 @@ class ChunkedEvalFilterMapSumBenchmark {
       .foldLeftL(0L)(_ + _)
 
     testResult(stream.runSyncUnsafe())
+    ()
   }
 
   @Benchmark

benchmarks/shared/src/main/scala/monix/benchmarks/MapParallelObservableBenchmark.scala

@@ -65,13 +65,13 @@ class MapParallelObservableBenchmark {
 
   @Benchmark
   def mapOrdered(): Long = {
-    val stream = Observable.range(0, size).mapParallelOrdered(parallelism)(x =>  Task.eval(x + 1))
+    val stream = Observable.range(0, size.toLong).mapParallelOrdered(parallelism)(x =>  Task.eval(x + 1))
     sum(stream)
   }
 
   @Benchmark
   def mapUnordered(): Long = {
-    val stream = Observable.range(0, size).mapParallelUnordered(parallelism)(x =>  Task.eval(x + 1))
+    val stream = Observable.range(0, size.toLong).mapParallelUnordered(parallelism)(x =>  Task.eval(x + 1))
     sum(stream)
   }
 
@@ -81,10 +81,16 @@ class MapParallelObservableBenchmark {
       val scheduler = global
       private[this] var sum: Long = 0
 
-      def onError(ex: Throwable): Unit =
+      def onError(ex: Throwable): Unit = {
         p.failure(ex)
-      def onComplete(): Unit =
+        ()
+      }
+
+      def onComplete(): Unit = {
         p.success(sum)
+        ()
+      }
+
       def onNext(elem: Long) = {
         sum += elem
         Continue

benchmarks/shared/src/main/scala/monix/benchmarks/ObservableConcatMapBenchmark.scala

@@ -60,15 +60,15 @@ class ObservableConcatMapBenchmark {
 
   @Benchmark
   def onePerCycle(): Long = {
-    val stream = Observable.range(0, size).flatMap { x =>
+    val stream = Observable.range(0, size.toLong).flatMap { x =>
       Observable.now(x + 1)
     }
     sum(stream)
   }
 
   @Benchmark
   def morePerCycle(): Long = {
-    val stream = Observable.range(0, size / 1000).flatMap { x =>
+    val stream = Observable.range(0, size.toLong / 1000).flatMap { x =>
       Observable.range(x, x + 1000)
     }
     sum(stream)
@@ -80,10 +80,16 @@ class ObservableConcatMapBenchmark {
       val scheduler = global
       private[this] var sum: Long = 0
 
-      def onError(ex: Throwable): Unit =
+      def onError(ex: Throwable): Unit = {
         p.failure(ex)
-      def onComplete(): Unit =
+        ()
+      }
+
+      def onComplete(): Unit = {
         p.success(sum)
+        ()
+      }
+
       def onNext(elem: Long) = {
         sum += elem
         Continue

benchmarks/shared/src/main/scala/monix/benchmarks/TaskSequenceBenchmark.scala

@@ -81,7 +81,7 @@ class TaskSequenceBenchmark {
   @Benchmark
   def catsParSequenceN(): Long = {
     val tasks = (0 until count).map(_ => IO(1)).toList
-    val result = tasks.parSequenceN(parallelism).map(_.sum.toLong)
+    val result = tasks.parSequenceN(parallelism.toLong).map(_.sum.toLong)
     result.unsafeRunSync()
   }
 

build.sbt

@@ -53,6 +53,10 @@ val reactiveStreamsVersion = "1.0.3"
 val minitestVersion = "2.8.2"
 val scalaTestVersion = "3.0.8"
 val implicitBoxVersion = "0.2.0"
+val kindProjectorVersion = "0.11.0"
+val betterMonadicForVersion = "0.3.1"
+val silencerVersion = "1.7.1"
+val scalaCompatVersion = "2.1.6"
 val customScalaJSVersion = Option(System.getenv("SCALAJS_VERSION"))
 
 // The Monix version with which we must keep binary compatibility.
@@ -66,84 +70,51 @@ lazy val doNotPublishArtifact = Seq(
   publishArtifact in (Compile, packageBin) := false
 )
 
-lazy val warnUnusedImport = Seq(
-  scalacOptions ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, 11)) =>
-        Seq("-Ywarn-unused-import")
-      case _ =>
-        Seq("-Ywarn-unused:imports")
-    }
-  },
-  scalacOptions in (Compile, console) --= Seq("-Ywarn-unused-import", "-Ywarn-unused:imports"),
-  scalacOptions in Test --= Seq("-Ywarn-unused-import", "-Ywarn-unused:imports")
-)
-
-lazy val sharedSettings = warnUnusedImport ++ Seq(
+lazy val sharedSettings = Seq(
   organization := "io.monix",
   scalaVersion := "2.13.3",
   crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3"),
 
-  scalacOptions ++= Seq(
-    // warnings
-    "-unchecked", // able additional warnings where generated code depends on assumptions
-    "-deprecation", // emit warning for usages of deprecated APIs
-    "-feature", // emit warning usages of features that should be imported explicitly
-    // Features enabled by default
-    "-language:higherKinds",
-    "-language:implicitConversions",
-    "-language:experimental.macros",
-  ),
-
-  scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, v)) if v <= 12 =>
-      Seq(
-        // possibly deprecated options
-        "-Ywarn-inaccessible",
-        // absolutely necessary for Iterant
-        "-Ypartial-unification",
-      )
-    case _ =>
-      Seq(
-        "-Ymacro-annotations",
-      )
-  }),
-
-  // Linter
-  scalacOptions ++= Seq(
-    // Turns all warnings into errors ;-)
-    "-Xfatal-warnings",
-    // Enables linter options
-    "-Xlint:adapted-args", // warn if an argument list is modified to match the receiver
-    "-Xlint:nullary-unit", // warn when nullary methods return Unit
-    "-Xlint:infer-any", // warn when a type argument is inferred to be `Any`
-    "-Xlint:missing-interpolator", // a string literal appears to be missing an interpolator id
-    "-Xlint:doc-detached", // a ScalaDoc comment appears to be detached from its element
-    "-Xlint:private-shadow", // a private field (or class parameter) shadows a superclass field
-    "-Xlint:type-parameter-shadow", // a local type parameter shadows a type already in scope
-    "-Xlint:poly-implicit-overload", // parameterized overloaded implicit methods are not visible as view bounds
-    "-Xlint:option-implicit", // Option.apply used implicit view
-    "-Xlint:delayedinit-select", // Selecting member of DelayedInit
-    "-Xlint:package-object-classes", // Class or object defined in package object
-  ),
-  scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, majorVersion)) if majorVersion <= 12 =>
-      Seq(
-        "-Xlint:inaccessible", // warn about inaccessible types in method signatures
-        "-Xlint:by-name-right-associative", // By-name parameter of right associative operator
-        "-Xlint:unsound-match" // Pattern match may not be typesafe
+  /*
+  // Enable this to debug warnings...
+  scalacOptions in Compile ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 13)) => Seq("-Wconf:any:warning-verbose")
+      case _ => Seq.empty
+    }
+  },
+  */
+
+  // Disabled from the sbt-tpolecat set
+  scalacOptions in Compile ~= { options: Seq[String] =>
+    options.filterNot(
+      Set(
+        "-Wunused:privates",
+        "-Ywarn-unused:privates",
+        "-Ywarn-unused:implicits",
+        "-Wunused:implicits",
+        "-Ywarn-unused:imports",
+        "-Wunused:explicits",
+        "-Ywarn-unused:params",
+        "-Wunused:params",
       )
-    case _ =>
-      Seq.empty
-  }),
+    )
+  },
 
-  // Turning off fatal warnings for ScalaDoc, otherwise we can't release.
-  scalacOptions in (Compile, doc) ~= (_ filterNot (_ == "-Xfatal-warnings")),
+  // Turning off fatal warnings for doc generation
+  scalacOptions.in(Compile, doc) ~= filterConsoleScalacOptions,
+  // Silence everything in auto-generated files
+  scalacOptions += "-P:silencer:pathFilters=.*[/]src_managed[/].*",
 
   // For working with partially-applied types
-  addCompilerPlugin("org.typelevel" % "kind-projector" % "0.11.0" cross CrossVersion.full),
+  addCompilerPlugin("org.typelevel" % "kind-projector" % kindProjectorVersion cross CrossVersion.full),
+  addCompilerPlugin("com.olegpy" %% "better-monadic-for" % betterMonadicForVersion),
+  addCompilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
+
+  libraryDependencies +=
+    "org.scala-lang.modules" %% "scala-collection-compat" % scalaCompatVersion % "optional;provided",
 
-  // ScalaDoc settings
+      // ScalaDoc settings
   autoAPIMappings := true,
   scalacOptions in ThisBuild ++= Seq(
     // Note, this is used by the doc-source-url feature to determine the

monix-catnap/jvm/src/main/scala_2.12+/monix/catnap/internal/FutureLiftForPlatform.scala

@@ -20,7 +20,6 @@ package internal
 
 import java.util.concurrent.{CancellationException, CompletableFuture, CompletionException}
 import java.util.function.BiFunction
-
 import cats.effect.{Async, Concurrent}
 
 private[catnap] abstract class FutureLiftForPlatform {
@@ -32,7 +31,7 @@ private[catnap] abstract class FutureLiftForPlatform {
     F.flatMap(fa) { cf =>
       F.cancelable { cb =>
         subscribeToCompletable(cf, cb)
-        F.delay(cf.cancel(true))
+        F.delay { cf.cancel(true); () }
       }
     }
 
@@ -97,5 +96,6 @@ private[catnap] abstract class FutureLiftForPlatform {
         }
       }
     })
+    ()
   }
 }