drop dotc.util.chaining in favour of the stdlib

Author: hamzaremmal

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/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/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 {