Add unsafeNulls imports

Author: noti0na1

compiler/src/dotty/tools/FatalError.scala

@@ -1,5 +1,5 @@
 package dotty.tools
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 case class FatalError(msg: String) extends Exception(msg)

compiler/src/dotty/tools/backend/jvm/AsmUtils.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.tools.asm.tree.{AbstractInsnNode}
 import java.io.PrintWriter
 import scala.tools.asm.util.{TraceClassVisitor, TraceMethodVisitor, Textifier}

compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.report

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.annotation.switch
 import scala.collection.mutable.SortedMap
 

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.annotation.threadUnsafe
 import scala.tools.asm
 import scala.tools.asm.AnnotationVisitor

compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.tools.asm
 import scala.annotation.switch
 import Primitives.{NE, EQ, TestOp, ArithmeticOp}

compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala

@@ -2,10 +2,11 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.collection.{ mutable, immutable }
 
 import scala.tools.asm
-
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.TreeTypeMap
 import dotty.tools.dotc.CompilationUnit

compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.collection.immutable
 import scala.tools.asm
 

compiler/src/dotty/tools/backend/jvm/BTypes.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import scala.tools.asm
 
 /**

compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala

@@ -2,6 +2,8 @@ package dotty.tools
 package backend
 package jvm
 
+import scala.language.unsafeNulls
+
 import java.io.{ DataOutputStream, FileOutputStream, IOException, File as JFile }
 import java.nio.channels.ClosedByInterruptException
 import dotty.tools.io._

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -1,5 +1,7 @@
 package dotty.tools.backend.jvm
 
+import scala.language.unsafeNulls
+
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.transform.SymUtils._

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -1,5 +1,7 @@
 package dotty.tools.backend.jvm
 
+import scala.language.unsafeNulls
+
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.Trees.{PackageDef, ValDef}
 import dotty.tools.dotc.ast.tpd

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -1,14 +1,13 @@
 package dotty.tools.backend.sjs
 
-import scala.annotation.switch
+import scala.language.unsafeNulls
 
+import scala.annotation.switch
 import scala.collection.mutable
 
 import dotty.tools.FatalError
-
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.tpd
-
 import dotty.tools.dotc.core._
 import Contexts._
 import Decorators._

compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala

@@ -1,8 +1,10 @@
 package dotty.tools.backend.sjs
 
-import dotty.tools.dotc.core._
+import scala.language.unsafeNulls
 
 import scala.annotation.threadUnsafe
+
+import dotty.tools.dotc.core._
 import Types._
 import Contexts._
 import Symbols._

compiler/src/dotty/tools/backend/sjs/JSEncoding.scala

@@ -1,5 +1,7 @@
 package dotty.tools.backend.sjs
 
+import scala.language.unsafeNulls
+
 import scala.collection.mutable
 
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala

@@ -1,7 +1,8 @@
 package dotty.tools.backend.sjs
 
-import scala.annotation.tailrec
+import scala.language.unsafeNulls
 
+import scala.annotation.tailrec
 import scala.collection.mutable
 
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/backend/sjs/JSPositions.scala

@@ -1,5 +1,7 @@
 package dotty.tools.backend.sjs
 
+import scala.language.unsafeNulls
+
 import java.net.{URI, URISyntaxException}
 
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/dotc/Bench.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core.Contexts._
 import reporting.Reporter

compiler/src/dotty/tools/dotc/CompilationUnit.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Contexts._

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Contexts._

compiler/src/dotty/tools/dotc/Main.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 /** Main class of the `dotc` batch compiler. */
 object Main extends Driver

compiler/src/dotty/tools/dotc/MissingCoreLibraryException.scala

@@ -1,6 +1,6 @@
 package dotty.tools.dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import dotty.tools.FatalError
 

compiler/src/dotty/tools/dotc/Resident.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core.Contexts._
 import reporting.Reporter

compiler/src/dotty/tools/dotc/Run.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Contexts._

compiler/src/dotty/tools/dotc/ScalacCommand.scala

@@ -1,6 +1,6 @@
 package dotty.tools.dotc
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import config.Properties._
 import config.CompilerCommand

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags._
@@ -523,9 +523,9 @@ object desugar {
         val enumCompanionRef = TermRefTree()
         val enumImport =
           Import(enumCompanionRef, enumCases.flatMap(caseIds).map(
-            enumCase => 
+            enumCase =>
               ImportSelector(enumCase.withSpan(enumCase.span.startPos))
-            ) 
+            )
           )
         (enumImport :: enumStats, enumCases, enumCompanionRef)
       }
@@ -1136,7 +1136,7 @@ object desugar {
       val matchExpr =
         if (tupleOptimizable) rhs
         else
-          val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids)) 
+          val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids))
           Match(makeSelector(rhs, MatchCheck.IrrefutablePatDef), caseDef :: Nil)
       vars match {
         case Nil if !mods.is(Lazy) =>
@@ -1157,11 +1157,11 @@ object desugar {
           val restDefs =
             for (((named, tpt), n) <- vars.zipWithIndex if named.name != nme.WILDCARD)
             yield
-              if mods.is(Lazy) then 
+              if mods.is(Lazy) then
                 DefDef(named.name.asTermName, Nil, tpt, selector(n))
                   .withMods(mods &~ Lazy)
                   .withSpan(named.span)
-              else 
+              else
                 valDef(
                   ValDef(named.name.asTermName, tpt, selector(n))
                     .withMods(mods)

compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import util.Spans._, Types._, Contexts._, Constants._, Names._, Flags._

compiler/src/dotty/tools/dotc/ast/MainProxies.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Symbols._, Types._, Contexts._, Flags._, Constants._

compiler/src/dotty/tools/dotc/ast/NavigateAST.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core.Contexts._
 import core.Decorators._

compiler/src/dotty/tools/dotc/ast/Positioned.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import util.Spans._
 import util.{SourceFile, SourcePosition, SrcPos}

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Flags._, Trees._, Types._, Contexts._

compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import Trees._
 import core.Contexts._

compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Types._, Contexts._, Flags._

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Types._, Names._, NameOps._, Flags._, util.Spans._, Contexts._, Constants._

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import dotty.tools.dotc.transform.{ExplicitOuter, Erasure}
 import typer.ProtoTypes
@@ -254,7 +254,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
         val previousParamRefs: ListBuffer[TermRef] =
           // It is ok to assign `null` here.
           // If `isParamDependent == false`, the value of `previousParamRefs` is not used.
-          if isParamDependent then mutable.ListBuffer[TermRef]() else null.asInstanceOf
+          if isParamDependent then mutable.ListBuffer[TermRef]() else (null: ListBuffer[TermRef] | Null).uncheckedNN
 
         def valueParam(name: TermName, origInfo: Type): TermSymbol =
           val maybeImplicit =

compiler/src/dotty/tools/dotc/ast/untpd.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package ast
 
-import scala.language.{unsafeNulls => _}
+import scala.language.unsafeNulls as _
 
 import core._
 import Types._, Contexts._, Constants._, Names._, Flags._

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -4,6 +4,8 @@
 package dotty.tools
 package dotc.classpath
 
+import scala.language.unsafeNulls
+
 import java.net.URL
 import scala.collection.mutable.ArrayBuffer
 import scala.collection.immutable.ArraySeq

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -3,6 +3,8 @@
  */
 package dotty.tools.dotc.classpath
 
+import scala.language.unsafeNulls
+
 import java.io.{File => JFile}
 import java.net.URL
 import java.nio.file.{FileSystems, Files}