Update calls to Annotation.deferred

Author: odersky

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -972,9 +972,8 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
     val start = readIndex
     val atp = readTypeRef()
     val phase = ctx.phase
-    Annotation.deferred(
-      atp.typeSymbol, implicit ctx =>
-        atReadPos(start, () => readAnnotationContents(end)(ctx.withPhase(phase))))
+    Annotation.deferred(atp.typeSymbol)(
+        atReadPos(start, () => readAnnotationContents(end)(the[Context].withPhase(phase))))
   }
 
   /* Read an abstract syntax tree */

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

@@ -795,7 +795,7 @@ class Namer { typer: Typer =>
           if (cls eq sym)
             ctx.error("An annotation class cannot be annotated with iself", annotTree.sourcePos)
           else {
-            val ann = Annotation.deferred(cls, implicit ctx => typedAnnotation(annotTree))
+            val ann = Annotation.deferred(cls)(typedAnnotation(annotTree))
             sym.addAnnotation(ann)
             if (cls == defn.ForceInlineAnnot && sym.is(Method, butNot = Accessor))
               sym.setFlag(Inline)