Merge pull request #11199 from dotty-staging/change-colon-with

Change colon to with in dotty codebase

Author: odersky

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -7,7 +7,7 @@ import org.junit.{Ignore, Test}
 import org.junit.Assert.{assertEquals, fail}
 import org.junit.experimental.categories.Category
 
-abstract class CommunityBuildTest:
+abstract class CommunityBuildTest with
   given CommunityBuildTest = this
 
   /** Depending on the mode of operation, either
@@ -81,7 +81,7 @@ abstract class CommunityBuildTest:
 end CommunityBuildTest
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestA extends CommunityBuildTest:
+class CommunityBuildTestA extends CommunityBuildTest with
   @Test def endpoints4s = projects.endpoints4s.run()
   @Test def fansi = projects.fansi.run()
   @Test def fastparse = projects.fastparse.run()
@@ -119,7 +119,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
 end CommunityBuildTestA
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestB extends CommunityBuildTest:
+class CommunityBuildTestB extends CommunityBuildTest with
   @Test def algebra = projects.algebra.run()
   @Test def betterfiles = projects.betterfiles.run()
   @Test def cats = projects.cats.run()

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

@@ -11,7 +11,7 @@ import scala.annotation.internal.sharable
  *  number of compilers and run each (sequentially) a given number of times
  *  on the same sources.
  */
-object Bench extends Driver:
+object Bench extends Driver with
 
   @sharable private var numRuns = 1
 

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

@@ -20,7 +20,7 @@ object DesugarEnums {
     val Simple, Object, Class: Value = Value
   }
 
-  final case class EnumConstraints(minKind: CaseKind.Value, maxKind: CaseKind.Value, enumCases: List[(Int, RefTree)]):
+  final case class EnumConstraints(minKind: CaseKind.Value, maxKind: CaseKind.Value, enumCases: List[(Int, RefTree)]) with
     require(minKind <= maxKind && !(cached && enumCases.isEmpty))
     def requiresCreator = minKind == CaseKind.Simple
     def isEnumeration   = maxKind < CaseKind.Class

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

@@ -943,7 +943,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
   /** Extractor for not-null assertions.
    *  A not-null assertion for reference `x` has the form `x.$asInstanceOf$[x.type & T]`.
    */
-  object AssertNotNull :
+  object AssertNotNull  with
     def apply(tree: tpd.Tree, tpnn: Type)(using Context): tpd.Tree =
       tree.select(defn.Any_typeCast).appliedToType(AndType(tree.tpe, tpnn))
 

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

@@ -382,7 +382,7 @@ object Trees {
     def rhs(using Context): Tree[T] = forceIfLazy
   }
 
-  trait ValOrTypeDef[-T >: Untyped] extends MemberDef[T]:
+  trait ValOrTypeDef[-T >: Untyped] extends MemberDef[T] with
     type ThisTree[-T >: Untyped] <: ValOrTypeDef[T]
 
   type ParamClause[T >: Untyped] = List[ValDef[T]] | List[TypeDef[T]]
@@ -444,7 +444,7 @@ object Trees {
   }
 
   /** The kind of application */
-  enum ApplyKind:
+  enum ApplyKind with
     case Regular      // r.f(x)
     case Using        // r.f(using x)
     case InfixTuple   // r f (x1, ..., xN) where N != 1;  needs to be treated specially for an error message in typedApply
@@ -1591,12 +1591,12 @@ object Trees {
       }
     }.asInstanceOf[tree.ThisTree[T]]
 
-    object TypeDefs:
+    object TypeDefs with
       def unapply(xs: List[Tree]): Option[List[TypeDef]] = xs match
         case (x: TypeDef) :: _ => Some(xs.asInstanceOf[List[TypeDef]])
         case _ => None
 
-    object ValDefs:
+    object ValDefs with
       def unapply(xs: List[Tree]): Option[List[ValDef]] = xs match
         case Nil => Some(Nil)
         case (x: ValDef) :: _ => Some(xs.asInstanceOf[List[ValDef]])

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

@@ -1230,12 +1230,12 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     Ident(defn.ScalaRuntimeModule.requiredMethod(name).termRef).appliedToTermArgs(args)
 
   /** An extractor that pulls out type arguments */
-  object MaybePoly:
+  object MaybePoly with
     def unapply(tree: Tree): Option[(Tree, List[Tree])] = tree match
       case TypeApply(tree, targs) => Some(tree, targs)
       case _ => Some(tree, Nil)
 
-  object TypeArgs:
+  object TypeArgs with
     def unapply(ts: List[Tree]): Option[List[Tree]] =
       if ts.nonEmpty && ts.head.isType then Some(ts) else None
 

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

@@ -155,7 +155,7 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
   }
 
   def WildcardTypeBoundsTree()(using src: SourceFile): TypeBoundsTree = TypeBoundsTree(EmptyTree, EmptyTree, EmptyTree)
-  object WildcardTypeBoundsTree:
+  object WildcardTypeBoundsTree with
     def unapply(tree: untpd.Tree): Boolean = tree match
       case TypeBoundsTree(EmptyTree, EmptyTree, _) => true
       case _ => false

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

@@ -6,7 +6,7 @@ import java.lang.Character.isWhitespace
 
 /** A simple enough command line parser.
  */
-object CommandLineParser:
+object CommandLineParser with
   inline private val DQ  = '"'
   inline private val SQ  = '\''
   inline private val EOF = -1

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

@@ -10,7 +10,7 @@ import util.SrcPos
 import SourceVersion._
 import reporting.Message
 
-object Feature:
+object Feature with
 
   private val dependent = "dependent".toTermName
   private val namedTypeArguments = "namedTypeArguments".toTermName

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

@@ -8,7 +8,7 @@ import core.StdNames.nme
 import core.Decorators.{_, given}
 import util.Property
 
-enum SourceVersion:
+enum SourceVersion with
   case `3.0-migration`, `3.0`, `3.1-migration`, `3.1`
 
   val isMigrating: Boolean = toString.endsWith("-migration")
@@ -18,7 +18,7 @@ enum SourceVersion:
 
   def isAtLeast(v: SourceVersion) = stable.ordinal >= v.ordinal
 
-object SourceVersion extends Property.Key[SourceVersion]:
+object SourceVersion extends Property.Key[SourceVersion] with
   def defaultSourceVersion = `3.0`
 
   val allSourceVersionNames = values.toList.map(_.toString.toTermName)