Use the stdlib more instead of defining methods in dotc.util

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

@@ -12,12 +12,13 @@ import java.util.zip.{CRC32, Deflater, ZipEntry, ZipOutputStream}
 
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
-import dotty.tools.dotc.util.chaining.*
 import dotty.tools.io.{AbstractFile, PlainFile, VirtualFile}
 import dotty.tools.io.PlainFile.toPlainFile
 import BTypes.InternalName
 import dotty.tools.io.JarArchive
 
+import scala.util.chaining.*
+
 /** !!! This file is now copied in `dotty.tools.io.FileWriters` in a more general way that does not rely upon
  * `PostProcessorFrontendAccess`, this should probably be changed to wrap that class instead.
  *

compiler/src/dotty/tools/debug/JavaEncoding.scala

@@ -6,7 +6,7 @@ import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
-import dotty.tools.dotc.util.NameTransformer
+import scala.reflect.NameTransformer
 
 // Inspired by https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala
 private object JavaEncoding:
@@ -26,7 +26,7 @@ private object JavaEncoding:
     else className(sym)
 
   def encode(name: TermName)(using Context): String =
-    NameTransformer.encode(name.toSimpleName).toString
+    NameTransformer.encode(name.toString)
 
   private def binaryName(tpe: Type)(using Context): String =
     tpe match

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

@@ -10,10 +10,10 @@ import dotty.tools.io.{AbstractFile, FileExtension}
 import reporting.*
 import core.Decorators.*
 import config.Feature
-import util.chaining.*
+import fromtasty.{TASTYCompiler, TastyFileUtil}
 
 import scala.util.control.NonFatal
-import fromtasty.{TASTYCompiler, TastyFileUtil}
+import scala.util.chaining.*
 
 /** Run the Dotty compiler.
  *

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

@@ -38,7 +38,6 @@ import Run.Progress
 import scala.compiletime.uninitialized
 import dotty.tools.dotc.transform.MegaPhase
 import dotty.tools.dotc.transform.Pickler.AsyncTastyHolder
-import dotty.tools.dotc.util.chaining.*
 import java.util.{Timer, TimerTask}
 
 /** A compiler run. Exports various methods to compile source files */

compiler/src/dotty/tools/dotc/cc/CheckCaptures.scala

@@ -17,7 +17,6 @@ import typer.Checking.{checkBounds, checkAppliedTypesIn}
 import typer.ErrorReporting.err
 import typer.ProtoTypes.{LhsProto, WildcardSelectionProto, SelectionProto}
 import util.{SimpleIdentitySet, EqHashMap, EqHashSet, SrcPos, Property}
-import util.chaining.tap
 import transform.{Recheck, PreRecheck, CapturedVars}
 import Recheck.*
 import scala.collection.mutable
@@ -32,6 +31,7 @@ import Capabilities.*
 import Mutability.*
 import util.common.alwaysTrue
 import scala.annotation.constructorOnly
+import scala.util.chaining.*
 
 /** The capture checker */
 object CheckCaptures:

compiler/src/dotty/tools/dotc/cc/Setup.scala

@@ -13,7 +13,6 @@ import ast.tpd, tpd.*
 import transform.{PreRecheck, Recheck}, Recheck.*
 import Synthetics.isExcluded
 import util.SimpleIdentitySet
-import util.chaining.*
 import reporting.Message
 import printing.{Printer, Texts}, Texts.{Text, Str}
 import collection.mutable

compiler/src/dotty/tools/dotc/config/CliCommand.scala

@@ -6,8 +6,8 @@ import core.Contexts.*
 import printing.Highlighting
 import reporting.NoExplanation
 
-import dotty.tools.dotc.util.chaining.*
 import scala.PartialFunction.cond
+import scala.util.chaining.*
 
 trait CliCommand:
 

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -10,7 +10,7 @@ import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, NoAbstractFile}
 import Setting.ChoiceWithHelp
 import ScalaSettingCategories.*
 
-import dotty.tools.dotc.util.chaining.*
+import scala.util.chaining.*
 
 import java.util.zip.Deflater
 

compiler/src/dotty/tools/dotc/config/Settings.scala

@@ -12,7 +12,6 @@ import reflect.ClassTag
 import scala.util.{Success, Failure}
 
 import config.Settings.Setting.ChoiceWithHelp
-import util.chaining.*
 
 object Settings:
 

compiler/src/dotty/tools/dotc/core/Names.scala

@@ -3,14 +3,14 @@ package dotc
 package core
 
 import scala.io.Codec
-import util.NameTransformer
 import printing.{Showable, Texts, Printer}
 import Texts.Text
 import StdNames.str
 import config.Config
 import util.{LinearMap, HashSet}
 
 import scala.annotation.internal.sharable
+import scala.reflect.NameTransformer
 
 object Names {
   import NameKinds.*
@@ -346,10 +346,10 @@ object Names {
     override def encode: SimpleName = {
       val dontEncode =
         this == StdNames.nme.CONSTRUCTOR || this == StdNames.nme.STATIC_CONSTRUCTOR
-      if (dontEncode) this else NameTransformer.encode(this)
+      if (dontEncode) this else termName(NameTransformer.encode(this.toString))
     }
 
-    override def decode: SimpleName = NameTransformer.decode(this)
+    override def decode: SimpleName = termName(NameTransformer.decode(this.toString))
 
     override def isEmpty: Boolean = length == 0
 

compiler/src/dotty/tools/dotc/inlines/Inlines.scala

@@ -21,10 +21,11 @@ import staging.StagingLevel
 import cc.CleanupRetains
 
 import collection.mutable
+import scala.util.chaining.*
+
 import reporting.{NotConstant, trace}
 import util.Spans.Span
 import dotty.tools.dotc.core.Periods.PhaseId
-import dotty.tools.dotc.util.chaining.*
 
 /** Support for querying inlineable methods and for inlining calls to such methods */
 object Inlines:

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -4,9 +4,12 @@ package parsing
 
 import scala.language.unsafeNulls
 
+import scala.annotation.tailrec
 import scala.annotation.internal.sharable
 import scala.collection.mutable.ListBuffer
 import scala.collection.immutable.BitSet
+import scala.util.chaining.*
+
 import util.{ SourceFile, SourcePosition, NoSourcePosition }
 import Tokens.*
 import Scanners.*
@@ -26,15 +29,13 @@ import Symbols.NoSymbol
 import ScriptParsers.*
 import Decorators.*
 import util.Chars
-import scala.annotation.tailrec
 import rewrites.Rewrites.{overlapsPatch, patch, unpatch}
 import reporting.*
 import config.Feature
 import config.Feature.{sourceVersion, migrateTo3}
 import config.SourceVersion.*
 import config.SourceVersion
 import dotty.tools.dotc.config.MigrationVersion
-import dotty.tools.dotc.util.chaining.*
 import dotty.tools.dotc.config.Feature.ccEnabled
 
 object Parsers {

compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala

@@ -6,10 +6,11 @@ import dotty.tools.dotc.config.Settings.Setting
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING}
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.dotc.util.chaining.*
+import core.Decorators.toMessage
+
+import scala.util.chaining.*
 
 import java.util.{Collections, Optional, List => JList}
-import core.Decorators.toMessage
 
 object Diagnostic:
 

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -27,9 +27,8 @@ import java.io.PrintWriter
 import ExtractAPI.NonLocalClassSymbolsInCurrentUnits
 
 import scala.collection.mutable
+import scala.util.chaining.*
 import scala.util.hashing.MurmurHash3
-import dotty.tools.dotc.util.chaining.*
-
 /** This phase sends a representation of the API of classes to sbt via callbacks.
  *
  *  This is used by sbt for incremental recompilation.

compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala

@@ -11,11 +11,11 @@ import core.Names.Name
 import core.StdNames.tpnme
 
 import collection.mutable
+import scala.util.chaining.*
 
 import dotty.tools.dotc.{semanticdb => s}
 import Scala3.{FakeSymbol, SemanticSymbol, WildcardTypeSymbol, TypeParamRefSymbol, TermParamRefSymbol, RefinementSymbol}
 import dotty.tools.dotc.core.Names.Designator
-import dotty.tools.dotc.util.chaining.*
 
 class TypeOps:
   import SymbolScopeOps.*

compiler/src/dotty/tools/dotc/transform/CheckUnused.scala

@@ -20,11 +20,11 @@ import typer.Deriving.OriginalTypeClass
 import typer.Implicits.{ContextualImplicits, RenamedImplicitRef}
 import util.{Property, Spans, SrcPos}, Spans.Span
 import util.Chars.{isLineBreakChar, isWhitespace}
-import util.chaining.*
 
 import java.util.IdentityHashMap
 
 import scala.collection.mutable, mutable.{ArrayBuilder, ListBuffer, Stack}
+import scala.util.chaining.*
 
 import CheckUnused.*
 

compiler/src/dotty/tools/dotc/transform/Pickler.scala

@@ -28,9 +28,9 @@ import dotty.tools.dotc.transform.Pickler.writeSigFilesAsync
 import dotty.tools.io.FileWriters.{EagerReporter, BufferingReporter}
 import dotty.tools.dotc.sbt.interfaces.IncrementalCallback
 import dotty.tools.dotc.sbt.asyncZincPhasesCompleted
-import dotty.tools.dotc.util.chaining.*
 import scala.concurrent.ExecutionContext
 import scala.util.control.NonFatal
+import scala.util.chaining.*
 import java.util.concurrent.atomic.AtomicBoolean
 import java.nio.file.Files
 

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

@@ -3,6 +3,7 @@ package transform.localopt
 
 import scala.annotation.tailrec
 import scala.collection.mutable.ListBuffer
+import scala.util.chaining.*
 import scala.util.matching.Regex.Match
 
 import dotty.tools.dotc.ast.tpd.{Match => _, *}
@@ -12,7 +13,6 @@ import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.Phases.typerPhase
 import dotty.tools.dotc.reporting.BadFormatInterpolation
 import dotty.tools.dotc.util.Spans.Span
-import dotty.tools.dotc.util.chaining.*
 
 /** Formatter string checker. */
 class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List[Tree])(using Context):

compiler/src/dotty/tools/dotc/typer/Applications.scala

@@ -25,8 +25,6 @@ import reporting.*
 import Nullables.*, NullOpsDecorator.*
 import config.{Feature, MigrationVersion, SourceVersion}
 import util.Property
-import util.chaining.tap
-
 import collection.mutable
 import config.Printers.{overload, typr, unapp}
 import TypeApplications.*
@@ -38,6 +36,7 @@ import annotation.threadUnsafe
 
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
+import scala.util.chaining.*
 import dotty.tools.dotc.cc.isRetains
 import dotty.tools.dotc.inlines.Inlines
 

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -31,7 +31,6 @@ import EtaExpansion.etaExpand
 import TypeComparer.CompareResult
 import inlines.{Inlines, PrepareInlineable}
 import util.Spans.*
-import util.chaining.*
 import util.common.*
 import util.{Property, SimpleIdentityMap, SrcPos}
 import Applications.{tupleComponentTypes, wrapDefs, defaultArgument}
@@ -53,7 +52,7 @@ import config.MigrationVersion
 import transform.CheckUnused.OriginalName
 
 import scala.annotation.{unchecked as _, *}
-import dotty.tools.dotc.util.chaining.*
+import scala.util.chaining.*
 import dotty.tools.dotc.ast.untpd.Mod
 
 object Typer {