Fix some warnings (#3051)

Pull request: #3051

Co-authored-by: Tobias Roeser <le.petit.fou@web.de>

contrib/bintray/src/mill/contrib/bintray/BintrayPublisher.scala

@@ -89,7 +89,7 @@ class BintrayPublisher(
         if !response.is2xx
       } yield artifact -> s"Code: ${response.statusCode}, message: ${response.text()}"
 
-    val errorsByArtifact = errors.groupBy(_._1).mapValues(_.map(_._2)).toSeq
+    val errorsByArtifact = errors.groupBy(_._1).view.mapValues(_.map(_._2)).toSeq
 
     if (errorsByArtifact.nonEmpty) {
       throw new RuntimeException(

contrib/bloop/src/mill/contrib/bloop/BloopImpl.scala

@@ -27,7 +27,7 @@ class BloopImpl(ev: () => Evaluator, wd: os.Path) extends ExternalModule { outer
    * under pwd/.bloop.
    */
   def install() = T.command {
-    val res = T.traverse(computeModules)(_.bloop.writeConfig)()
+    val res = T.traverse(computeModules)(_.bloop.writeConfigFile())()
     val written = res.map(_._2).map(_.path)
     // Make bloopDir if it doesn't exists
     if (!os.exists(bloopDir)) {

contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala

@@ -76,7 +76,7 @@ object BloopTests extends TestSuite {
 
   def readBloopConf(jsonFile: String) =
     _root_.bloop.config.read((workdir / ".bloop" / jsonFile).toNIO)
-      .right
+      .toOption
       .get
 
   def tests: Tests = Tests {
@@ -166,7 +166,7 @@ object BloopTests extends TestSuite {
       }
       "configAccessTest" - {
         val (accessedConfig, _) =
-          testEvaluator(build.scalaModule.bloop.config).asSuccess.get.value.right.get
+          testEvaluator(build.scalaModule.bloop.config).asSuccess.get.value.toOption.get
         assert(accessedConfig == scalaModuleConfig)
       }
       "noDepTest" - {
@@ -203,7 +203,7 @@ object BloopTests extends TestSuite {
             val platform = p.platform.get.asInstanceOf[BloopConfig.Platform.Native]
 
             val (clang, _) =
-              testEvaluator(build.scalanativeModule.nativeClang).asSuccess.get.value.right.get
+              testEvaluator(build.scalanativeModule.nativeClang).asSuccess.get.value.toOption.get
 
             assert(name == "scalanativeModule")
             assert(workspaceDir == Some(workdir.wrapped))

contrib/proguard/test/src/mill/contrib/proguard/ProguardTests.scala

@@ -54,10 +54,8 @@ object ProguardTests extends TestSuite {
       }
 
       test("should create a proguarded jar") - workspaceTest(proguard) { eval =>
-        try {
-          val Right((path, _)) = eval.apply(proguard.proguard)
-          assert(os.exists(path.path))
-        }
+        val Right((path, _)) = eval.apply(proguard.proguard)
+        assert(os.exists(path.path))
       }
     }
   }

contrib/versionfile/test/src/mill/contrib/versionfile/VersionFileModuleTests.scala

@@ -115,22 +115,22 @@ object VersionFileModuleTests extends TestSuite {
 
       test("setReleaseVersion") - workspaceTest(versions: _*) { eval =>
         val expected = eval(TestModule.versionFile.releaseVersion)
-        val write = eval(TestModule.versionFile.setReleaseVersion())
+        eval(TestModule.versionFile.setReleaseVersion())
         val actual = eval(TestModule.versionFile.currentVersion)
         assert(expected.value == actual.value)
       }
 
       test("setNextVersion") - workspaceTest(versions: _*) { eval =>
         val bump = minor
         val expected = eval(TestModule.versionFile.nextVersion(bump))
-        val write = eval(TestModule.versionFile.setNextVersion(bump))
+        eval(TestModule.versionFile.setNextVersion(bump))
         val actual = eval(TestModule.versionFile.currentVersion)
         assert(expected.value == actual.value)
       }
 
       test("setVersion") - workspaceTest(versions: _*) { eval =>
         val expected = Version.Release(1, 2, 4)
-        val write = eval(TestModule.versionFile.setVersion(T.task(expected)))
+        eval(TestModule.versionFile.setVersion(T.task(expected)))
         val actual = eval(TestModule.versionFile.currentVersion)
         assert(actual.value == Right(expected))
       }

main/codesig/src/JvmModel.scala

@@ -3,6 +3,7 @@ import scala.collection.mutable.LinkedHashMap
 import upickle.default.{ReadWriter, readwriter, stringKeyRW}
 
 import scala.annotation.switch
+import scala.collection.immutable.ArraySeq
 
 // This file contains typed data structures representing the types and values
 // found in the JVM bytecode: various kinds of types, method signatures, method
@@ -223,7 +224,10 @@ object JvmModel {
         args.addOne(JType.read(s.substring(index, split + 1)))
         index = split + 1
       }
-      new Desc(args.result(), JType.read(s.substring(closeParenIndex + 1)))
+      new Desc(
+        ArraySeq.unsafeWrapArray(args.result()),
+        JType.read(s.substring(closeParenIndex + 1))
+      )
     }
 
     implicit val ordering: Ordering[Desc] = Ordering.by(_.pretty)

main/codesig/src/ResolvedCalls.scala

@@ -196,7 +196,7 @@ object ResolvedCalls {
       seen.add(current)
       seenList.append(current)
 
-      for (next <- edges(current)) {
+      for (next <- edges(current).iterator) {
         if (!seen.contains(next)) queued.enqueue(next)
       }
     }

main/codesig/test/cases/callgraph/realistic/3-par-merge-sort/src/Hello.scala

@@ -3,11 +3,12 @@ package hello
 // Taken from https://github.com/handsonscala/handsonscala/blob/ebc0367144513fc181281a024f8071a6153be424/examples/13.7%20-%20ParallelMergeSort/MergeSort.sc
 import mainargs.main
 
-object Main{
+object Main {
 
   import scala.concurrent._, duration.Duration.Inf, java.util.concurrent.Executors
 
-  implicit val ec = ExecutionContext.fromExecutorService(Executors.newFixedThreadPool(8))
+  implicit val ec: ExecutionContextExecutorService =
+    ExecutionContext.fromExecutorService(Executors.newFixedThreadPool(8))
 
   def mergeSortParallel[T: Ordering](items: IndexedSeq[T]): IndexedSeq[T] = {
     Await.result(mergeSortParallel0(items), Inf)

main/codesig/test/src/Util.scala

@@ -1,5 +1,7 @@
 package mill.codesig
 
+import scala.collection.immutable.ArraySeq
+
 object TestUtil {
 
   def computeCodeSig(segments: Seq[String]) = {
@@ -11,9 +13,11 @@ object TestUtil {
 //    println("testClassFolder: " + testClassFolder)
     CodeSig.compute(
       os.walk(testClassFolder).filter(_.ext == "class"),
-      sys.env("MILL_TEST_CLASSPATH_" + segments.mkString("-"))
-        .split(",")
-        .map(os.Path(_)),
+      ArraySeq.unsafeWrapArray(
+        sys.env("MILL_TEST_CLASSPATH_" + segments.mkString("-"))
+          .split(",")
+          .map(os.Path(_))
+      ),
       (_, _) => false,
       new Logger(Some(testLogFolder)),
       () => None

main/define/test/src/mill/define/ApplicativeTests.scala

@@ -5,6 +5,7 @@ import utest._
 
 import scala.annotation.compileTimeOnly
 import scala.language.experimental.macros
+import scala.language.implicitConversions
 
 object ApplicativeTests extends TestSuite {
   implicit def optionToOpt[T](o: Option[T]): Opt[T] = new Opt(o)
@@ -129,7 +130,7 @@ object ApplicativeTests extends TestSuite {
       // apply() call is identical. It's up to the downstream zipMap()
       // implementation to decide if it wants to dedup them or do other things.
       val counter = new Counter()
-      def up = Opt { "hello" + counter() }
+      def up = Opt { s"hello${counter()}" }
       val down = Opt { Seq(1, 2, 3).map(n => n + up() + up()) }
       assert(down == Some(Seq("1hello1hello2", "2hello1hello2", "3hello1hello2")))
     }

main/define/test/src/mill/define/CacherTests.scala

@@ -25,9 +25,8 @@ object CacherTests extends TestSuite {
   val tests = Tests {
     def eval[T <: TestUtil.BaseModule, V](mapping: T, v: Task[V])(implicit tp: TestPath) = {
       val evaluator = new TestEvaluator(mapping)
-      evaluator(v).right.get._1
+      evaluator(v).toOption.get._1
     }
-    def check(x: Any, y: Any) = assert(x == y)
 
     "simpleDefIsCached" - {
       Predef.assert(Base.value eq Base.value)

main/eval/test/src/mill/eval/JavaCompileJarTests.scala

@@ -157,14 +157,14 @@ object JavaCompileJarTests extends TestSuite {
         evaluator.outPath / "jar.dest" / "out.jar",
         "test.Foo"
       ).call(evaluator.outPath).out.text()
-      assert(executed == (31337 + 271828) + System.lineSeparator)
+      assert(executed == s"${31337 + 271828}${System.lineSeparator}")
 
       for (i <- 0 until 3) {
         // Build.run is not cached, so every time we eval it it has to
         // re-evaluate
         val Right((runOutput, evalCount)) = eval(Build.run("test.Foo"))
         assert(
-          runOutput.out.text() == (31337 + 271828) + System.lineSeparator,
+          runOutput.out.text() == s"${31337 + 271828}${System.lineSeparator}",
           evalCount == 1
         )
       }

scalajslib/test/src/mill/scalajslib/SmallModulesForTests.scala

@@ -36,7 +36,6 @@ object SmallModulesForTests extends TestSuite {
       test("it should have a single publicModule") {
         assert(publicModules.size == 1)
       }
-      val mainModule = publicModules.head
       val modulesLength = os.list(report.dest.path).length
       test("my.Foo should not have its own file since it is in a separate package") {
         assert(!os.exists(report.dest.path / "otherpackage.Foo.js"))

scalalib/test/src/mill/scalalib/CycleTests.scala

@@ -3,7 +3,7 @@ package mill.scalalib
 import mill.api.BuildScriptException
 import mill.util.{TestEvaluator, TestUtil}
 import utest.framework.TestPath
-import utest.{TestSuite, Tests, compileError, intercept, test, assert}
+import utest.{TestSuite, Tests, intercept, test, assert}
 
 object CycleTests extends TestSuite {