Replace delegate for by given as in compiler and tests.

Author: odersky

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

@@ -22,7 +22,7 @@ object Flags {
 
   type Flag = opaques.Flag
 
-  delegate FlagOps {
+  given FlagOps {
 
     def (x: FlagSet) bits: Long = opaques.toBits(x)
 

compiler/src/dotty/tools/dotc/interactive/Completion.scala

@@ -121,7 +121,7 @@ object Completion {
     if (buffer.mode != Mode.None) {
       path match {
         case Select(qual, _) :: _                    => buffer.addMemberCompletions(qual)
-        case Import(_, expr, _) :: _                 => buffer.addMemberCompletions(expr) // TODO: distinguish delegate from non-delegate
+        case Import(_, expr, _) :: _                 => buffer.addMemberCompletions(expr) // TODO: distinguish given from plain imports
         case (_: Thicket) :: Import(_, expr, _) :: _ => buffer.addMemberCompletions(expr)
         case _                                       => buffer.addScopeCompletions
       }

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

@@ -1206,7 +1206,7 @@ trait Implicits { self: Typer =>
           case fail: SearchFailureType =>
 
             def hiddenImplicitNote(s: SearchSuccess) =
-              em"\n\nNote: delegate ${s.ref.symbol.showLocated} was not considered because it was not imported with `import delegate`."
+              em"\n\nNote: given instance ${s.ref.symbol.showLocated} was not considered because it was not imported with `import given`."
 
             def FindHiddenImplicitsCtx(ctx: Context): Context =
               if (ctx == NoContext) ctx

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

@@ -28,7 +28,7 @@ object ImportInfo {
  *  @param   selectors     The selector clauses
  *  @param   symNameOpt    Optionally, the name of the import symbol. None for root imports.
  *                         Defined for all explicit imports from ident or select nodes.
- *  @param   importGiven true if this is a delegate import
+ *  @param   importGiven   true if this is a given import
  *  @param   isRootImport  true if this is one of the implicit imports of scala, java.lang,
  *                         scala.Predef or dotty.DottyPredef in the start context, false otherwise.
  */

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

@@ -949,7 +949,7 @@ class Namer { typer: Typer =>
 
         def whyNoForwarder(mbr: SingleDenotation): String = {
           val sym = mbr.symbol
-          if (sym.isOneOf(GivenOrImplicit) != exp.impliedOnly) s"is ${if (exp.impliedOnly) "not " else ""}a delegate"
+          if (sym.isOneOf(GivenOrImplicit) != exp.impliedOnly) s"is ${if (exp.impliedOnly) "not " else ""}a given instance"
           else if (!sym.isAccessibleFrom(path.tpe)) "is not accessible"
           else if (sym.isConstructor || sym.is(ModuleClass) || sym.is(Bridge)) SKIP
           else if (cls.derivesFrom(sym.owner) &&

compiler/test/dotty/tools/repl/ReplCompilerTests.scala

@@ -129,7 +129,7 @@ class ReplCompilerTests extends ReplTest {
   }
 
   @Test def i5897 =
-    fromInitialState { implicit state => run("delegate for Int = 10") }
+    fromInitialState { implicit state => run("given as Int = 10") }
     .andThen         { implicit state =>
       assertEquals(
         "def Int_given: Int",
@@ -151,7 +151,7 @@ class ReplCompilerTests extends ReplTest {
         |  def (x: T) > (y: T) = compare(x, y) > 0
         |}
         |
-        |delegate IntOrd for Ord[Int] {
+        |given IntOrd as Ord[Int] {
         |  def compare(x: Int, y: Int) =
         |  if (x < y) -1 else if (x > y) +1 else 0
         |}

library/src/scala/Eql.scala

@@ -16,7 +16,7 @@ object Eql {
   object derived extends Eql[Any, Any]
 
   /** A fall-back instance to compare values of any types.
-   *  Even though this method is not declared a delegate, the compiler will
+   *  Even though this method is not declared as given, the compiler will
    *  synthesize implicit arguments as solutions to `Eql[T, U]` queries if
    *  the rules of multiversal equality require it.
    */

library/src/scala/quoted/Liftable.scala

@@ -17,15 +17,15 @@ trait Liftable[T] {
  */
 object Liftable {
 
-  delegate Liftable_Boolean_delegate for Liftable[Boolean] = new PrimitiveLiftable
-  delegate Liftable_Byte_delegate for Liftable[Byte] = new PrimitiveLiftable
-  delegate Liftable_Short_delegate for Liftable[Short] = new PrimitiveLiftable
-  delegate Liftable_Int_delegate for Liftable[Int] = new PrimitiveLiftable
-  delegate Liftable_Long_delegate for Liftable[Long] = new PrimitiveLiftable
-  delegate Liftable_Float_delegate for Liftable[Float] = new PrimitiveLiftable
-  delegate Liftable_Double_delegate for Liftable[Double] = new PrimitiveLiftable
-  delegate Liftable_Char_delegate for Liftable[Char] = new PrimitiveLiftable
-  delegate Liftable_String_delegate for Liftable[String] = new PrimitiveLiftable
+  given Liftable_Boolean_delegate as Liftable[Boolean] = new PrimitiveLiftable
+  given Liftable_Byte_delegate as Liftable[Byte] = new PrimitiveLiftable
+  given Liftable_Short_delegate as Liftable[Short] = new PrimitiveLiftable
+  given Liftable_Int_delegate as Liftable[Int] = new PrimitiveLiftable
+  given Liftable_Long_delegate as Liftable[Long] = new PrimitiveLiftable
+  given Liftable_Float_delegate as Liftable[Float] = new PrimitiveLiftable
+  given Liftable_Double_delegate as Liftable[Double] = new PrimitiveLiftable
+  given Liftable_Char_delegate as Liftable[Char] = new PrimitiveLiftable
+  given Liftable_String_delegate as Liftable[String] = new PrimitiveLiftable
 
   private class PrimitiveLiftable[T <: Unit | Null | Int | Boolean | Byte | Short | Int | Long | Float | Double | Char | String] extends Liftable[T] {
     /** Lift a primitive value `n` into `'{ n }` */

library/src/scala/quoted/Type.scala

@@ -17,15 +17,15 @@ package quoted {
 
   /** Some basic type tags, currently incomplete */
   object Type {
-    delegate UnitTag for Type[Unit] = new TaggedType[Unit]
-    delegate BooleanTag for Type[Boolean] = new TaggedType[Boolean]
-    delegate ByteTag for Type[Byte] = new TaggedType[Byte]
-    delegate CharTag for Type[Char] = new TaggedType[Char]
-    delegate ShortTag for Type[Short] = new TaggedType[Short]
-    delegate IntTag for Type[Int] = new TaggedType[Int]
-    delegate LongTag for Type[Long] = new TaggedType[Long]
-    delegate FloatTag for Type[Float] = new TaggedType[Float]
-    delegate DoubleTag for Type[Double] = new TaggedType[Double]
+    given UnitTag as Type[Unit] = new TaggedType[Unit]
+    given BooleanTag as Type[Boolean] = new TaggedType[Boolean]
+    given ByteTag as Type[Byte] = new TaggedType[Byte]
+    given CharTag as Type[Char] = new TaggedType[Char]
+    given ShortTag as Type[Short] = new TaggedType[Short]
+    given IntTag as Type[Int] = new TaggedType[Int]
+    given LongTag as Type[Long] = new TaggedType[Long]
+    given FloatTag as Type[Float] = new TaggedType[Float]
+    given DoubleTag as Type[Double] = new TaggedType[Double]
   }
 
 }

library/src/scala/tasty/reflect/TreeUtils.scala

@@ -286,7 +286,7 @@ trait TreeUtils
   /** Bind the `rhs` to a `val` and use it in `body` */
   def let(rhs: Term)(body: Ident => Term): Term = {
     import scala.quoted.QuoteContext
-    delegate for QuoteContext = new QuoteContext(this)
+    given as QuoteContext = new QuoteContext(this)
     type T // TODO probably it is better to use the Sealed contruct rather than let the user create their own existential type
     implicit val rhsTpe: quoted.Type[T] = rhs.tpe.seal.asInstanceOf[quoted.Type[T]]
     val rhsExpr = rhs.seal.cast[T]