Fix build; remove fromNullable usage

Author: noti0na1

compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala

@@ -126,9 +126,7 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
     def at(g: SpecGroup): Int = descriptor.start(g.ordinal)
     def end(g: SpecGroup): Int = descriptor.end(g.ordinal)
     def offset(g: SpecGroup, i: Int = 0): Int = at(g) + i
-    def group(g: SpecGroup): Option[String] =
-      // Unable to use @experimental fromNullable now
-      Option(descriptor.group(g.ordinal)).asInstanceOf[Option[String]]
+    def group(g: SpecGroup): Option[String] = Option(descriptor.group(g.ordinal))
     def stringOf(g: SpecGroup): String = group(g).getOrElse("")
     def intOf(g: SpecGroup): Option[Int] = group(g).map(_.toInt)
 

project/Build.scala

@@ -683,6 +683,9 @@ object Build {
       // Note: bench/profiles/projects.yml should be updated accordingly.
       Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
 
+      // TODO: Enable fatal warnings after 3.8 because old stdlib has different nullability.
+      Compile / scalacOptions -= "-Werror",
+
       // Use source 3.3 to avoid fatal migration warnings on scalajs-ir
       scalacOptions ++= Seq("-source", "3.3"),
 
@@ -959,9 +962,6 @@ object Build {
       }
     }.value,
 
-    // TODO: Enable fatal warnings after 3.8 because old stdlib has different nullability.
-    (Compile / scalacOptions) -= "-Werror",
-
     (Test / testOptions) += Tests.Argument(
       TestFrameworks.JUnit,
       "--exclude-categories=dotty.BootstrappedOnlyTests",
@@ -2296,8 +2296,6 @@ object Build {
       // Make sure that the produced artifacts have the minimum JVM version in the bytecode
       Compile / javacOptions  ++= Seq("--release", Versions.minimumJVMVersion),
       Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion),
-      // TODO: Enable fatal warnings after 3.8 because old stdlib has different nullability.
-      Compile / scalacOptions -= "-Werror",
       // Specify the default entry point of the compiler
       Compile / mainClass := Some("dotty.tools.dotc.Main"),
       // Add entry's to the MANIFEST

scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala

@@ -74,8 +74,8 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
         else Right(TemplateSourceLink(supported.foldLeft(string)((template, pattern) =>
           template.replace(pattern, SupportedScalaDocPatternReplacements(pattern)))))
       case KnownProvider(name: String, organization: String, repo: String, rawRevision, rawSubPath) =>
-        val subPath = Option.fromNullable(rawSubPath).fold("")("/" + _.drop(1))
-        val pathRev = Option.fromNullable(rawRevision).map(_.drop(1)).orElse(revision)
+        val subPath = Option(rawSubPath).fold("")("/" + _.drop(1))
+        val pathRev = Option(rawRevision).map(_.drop(1)).orElse(revision)
 
         def withRevision(template: String => SourceLink) =
           pathRev.fold(Left(s"No revision provided"))(r => Right(template(r)))

scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala

@@ -116,8 +116,8 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite
 
   def loadBlog(): Option[LoadedTemplate] = {
     val blogConfig = BlogParser.readYml(root)
-    val rootPath = Option.fromNullable(blogConfig.input).map(input => ctx.resolveNewBlogPath(input)).getOrElse(ctx.blogPath)
-    val defaultDirectory = Option.fromNullable(blogConfig.output).getOrElse("blog")
+    val rootPath = Option(blogConfig.input).map(input => ctx.resolveNewBlogPath(input)).getOrElse(ctx.blogPath)
+    val defaultDirectory = Option(blogConfig.output).getOrElse("blog")
 
     type Date = (String, String, String)
     if (!Files.exists(rootPath) || blogConfig.hidden) None

scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala

@@ -277,7 +277,7 @@ class SymOpsWithLinkCache:
               then externalLinkCache(csym.associatedFile)
               else {
                 def calculatePath(file: AbstractFile): String = file.underlyingSource.filter(_ != file).fold("")(f => calculatePath(f) + "/") + file.path
-                val calculatedLink = Option.fromNullable(csym.associatedFile).map(f => calculatePath(f)).flatMap { path =>
+                val calculatedLink = Option(csym.associatedFile).map(f => calculatePath(f)).flatMap { path =>
                   dctx.externalDocumentationLinks.find(_.originRegexes.exists(r => r.matches(path)))
                 }
                 externalLinkCache += (csym.associatedFile -> calculatedLink)