Apply suggestions from code review

Co-authored-by: Alexandre Archambault <[email protected]>

Author: 2 people

modules/build/src/main/scala/scala/build/options/BuildOptions.scala

@@ -498,17 +498,19 @@ final case class BuildOptions(
       version.startsWith("3") && version.endsWith("-NIGHTLY")
 
     val (scalaVersion, scalaBinaryVersion) =
-      scalaOptions.scalaVersion match {
-        case Some("3.nightly") => value(computeLatestScalaThreeNightlyVersions())
-        case Some("2.nightly") => value(computeLatestScalaTwoNightlyVersions())
-        case Some(versionString) if isScala3Nightly(versionString) =>
-          value(turnScala3NightlyVersionArgIntoVersion(versionString))
-        case Some(versionString) if isScala2Nightly(versionString) =>
-          value(turnScala2NightlyVersionArgToVersions(versionString))
-        case _ => value(turnScalaVersionArgToScalaVersions(
-            scalaOptions.scalaVersion,
-            scalaOptions.scalaBinaryVersion
-          ))
+      value {
+        scalaOptions.scalaVersion match {
+          case Some("3.nightly") => computeLatestScalaThreeNightlyVersions()
+          case Some("2.nightly") => computeLatestScalaTwoNightlyVersions()
+          case Some(versionString) if isScala3Nightly(versionString) =>
+            turnScala3NightlyVersionArgIntoVersion(versionString)
+          case Some(versionString) if isScala2Nightly(versionString) =>
+            turnScala2NightlyVersionArgToVersions(versionString)
+          case _ => turnScalaVersionArgToScalaVersions(
+              scalaOptions.scalaVersion,
+              scalaOptions.scalaBinaryVersion
+            )
+        }
       }
 
     val maybePlatformSuffix = platform.value match {

modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala

@@ -67,9 +67,7 @@ class BuildOptionsTests extends munit.FunSuite {
       )
     )
     assert(
-      options.projectParams.isLeft && options.projectParams.left.get.isInstanceOf[
-        UnsupportedScalaVersionError
-      ],
+      options.projectParams.swap.exists { case _: UnsupportedScalaVersionError => true; case _ => false },
       "specifying the 2.11.2 scala version does not lead to the Unsupported Scala Version Error"
     )
   }

website/docs/commands/compile.md

@@ -68,15 +68,15 @@ scala-cli compile --scala 3 Hello.scala
 
 The nightly builds of Scala compiler are unstable ones which are published on a nightly basis.
 
-For using the latest scala 2 and scala 3 nightly builds, you should pass `2.nightly` and `3.nightly`, respectively.
+For using the latest Scala 2 and Scala 3 nightly builds, you should pass `2.nightly` and `3.nightly`, respectively.
 
-Scala-cli takes care of fetching the nightly builds of Scala 2 and Scala 3 from different online repositories, without you having to pass their addresses as input after the `--repo` flag.
+Scala CLI takes care of fetching the nightly builds of Scala 2 and Scala 3 from different repositories, without you having to pass their addresses as input after the `--repo` flag.
 
 For compiling with the latest Scala 2 nightly build: 
 ```bash
 scala-cli Hello.scala -S 2.nightly
 ```
-For compiling with the latest Scala 3 nightly build, in the command line:
+For compiling with the latest Scala 3 nightly build:
 ```bash
 scala-cli Hello.scala -S 3.nightly
 ```