ThoughtWorksInc · Atry · Dec 9, 2021 · Dec 9, 2021 · Dec 9, 2021 · Dec 9, 2021
diff --git a/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala b/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala
@@ -502,19 +502,6 @@ object Dsl extends LowPriorityDsl0 {
     ): Dsl.PolyCont[Typed[Keyword, Value], Domain, Value] =
       dsl
 
-    // TODO: Remove
-    given ToTypedKeyword[Keyword]: AnyRef with {
-      extension [Value](keyword: Keyword)
-        @inline def typed: Typed[Keyword, Value] = {
-          keyword
-        }
-    }
-
-    given [Keyword, Value]: AnyRef with {
-      extension [NewValue](typedKeyword: Typed[Keyword, Value])
-        @inline def withValueType: Typed[Keyword, NewValue] = typedKeyword
-    }
-
     @inline def apply[Keyword, Value]: Keyword =:= Typed[Keyword, Value] = summon
 
   }

diff --git a/bangnotation/src/main/scala/com/thoughtworks/dsl/bangnotation.scala b/bangnotation/src/main/scala/com/thoughtworks/dsl/bangnotation.scala
@@ -2,10 +2,8 @@ package com.thoughtworks
 package dsl
 import keywords._
 import com.thoughtworks.dsl.keywords._, Match._
-import Dsl.Typed.given
 import scala.quoted.Quotes
 import collection.immutable.Queue
-import Dsl.given
 import scala.util.control.Exception.Catcher
 /**
   * @example

diff --git a/keywords-Await/src/main/scala/com/thoughtworks/dsl/keywords/Await.scala b/keywords-Await/src/main/scala/com/thoughtworks/dsl/keywords/Await.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 import com.thoughtworks.dsl.Dsl
 import com.thoughtworks.dsl.domains.Continuation.!!
 import scala.concurrent.Await.result

diff --git a/keywords-FlatMap/src/main/scala/com/thoughtworks/dsl/keywords/FlatMap.scala b/keywords-FlatMap/src/main/scala/com/thoughtworks/dsl/keywords/FlatMap.scala
@@ -3,7 +3,6 @@ package keywords
 
 import com.thoughtworks.dsl.Dsl
 import Dsl.AsKeyword
-import Dsl.Typed
 import scala.util.NotGiven
 
 final case class FlatMap[Upstream, UpstreamValue, Mapped](

diff --git a/keywords-If/src/main/scala/com/thoughtworks/dsl/keywords/If.scala b/keywords-If/src/main/scala/com/thoughtworks/dsl/keywords/If.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 import Dsl.cpsApply
 
 final case class If[ConditionKeyword, ThenKeyword, ElseKeyword](

diff --git a/keywords-In/src/main/scala/com/thoughtworks/dsl/keywords/In.scala b/keywords-In/src/main/scala/com/thoughtworks/dsl/keywords/In.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 
 opaque type In[Element] = Iterable[Element]
 object In {
@@ -40,8 +39,6 @@ object In {
     }
   }
 
-  import Dsl.Typed
-
   // 这种方式要么增加运行时type class复杂度，要么需要修改AST而很难支持 for / yield
   // given[Element, MappedKeyword, Domain, MappedContainer[x] <: IterableOnce[x], MappedElement, PureValue](
   //   given

diff --git a/keywords-Monadic/src/main/scala/com/thoughtworks/dsl/keywords/Monadic.scala b/keywords-Monadic/src/main/scala/com/thoughtworks/dsl/keywords/Monadic.scala
@@ -2,7 +2,6 @@ package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
 import Dsl.AsKeyword
-import Dsl.Typed
 import scala.language.higherKinds
 import scala.language.implicitConversions
 

diff --git a/keywords-Return/src/main/scala/com/thoughtworks/dsl/keywords/Return.scala b/keywords-Return/src/main/scala/com/thoughtworks/dsl/keywords/Return.scala
@@ -6,7 +6,6 @@ import scala.language.implicitConversions
 
 import Dsl.AsKeyword
 import Dsl.Lift
-import Dsl.Typed
 
 /** A [[Dsl.Keyword]] to early return a lifted value from the enclosing function.
   *

diff --git a/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala b/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 
 import com.thoughtworks.dsl.Dsl
 import com.thoughtworks.dsl.keywords.Shift.{SameDomainStackSafeShiftDsl, StackSafeShiftDsl}

diff --git a/keywords-Suspend/src/main/scala/com/thoughtworks/dsl/keywords/Suspend.scala b/keywords-Suspend/src/main/scala/com/thoughtworks/dsl/keywords/Suspend.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 import Dsl.cpsApply
 
 opaque type Suspend[Keyword] = () => Keyword

diff --git a/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala b/keywords-TryCatch/src/main/scala/com/thoughtworks/dsl/keywords/TryCatch.scala
@@ -1,6 +1,5 @@
 package com.thoughtworks.dsl
 package keywords
-import Dsl.Typed
 import Dsl.!!
 import Dsl.cpsApply
 import Dsl.AsKeyword

diff --git a/keywords-TryCatchFinally/src/main/scala/com/thoughtworks/dsl/keywords/TryCatchFinally.scala b/keywords-TryCatchFinally/src/main/scala/com/thoughtworks/dsl/keywords/TryCatchFinally.scala
@@ -1,6 +1,5 @@
 package com.thoughtworks.dsl
 package keywords
-import Dsl.Typed
 import Dsl.!!
 import Dsl.AsKeyword
 import scala.util.control.Exception.Catcher

diff --git a/keywords-TryFinally/src/main/scala/com/thoughtworks/dsl/keywords/TryFinally.scala b/keywords-TryFinally/src/main/scala/com/thoughtworks/dsl/keywords/TryFinally.scala
@@ -1,6 +1,5 @@
 package com.thoughtworks.dsl
 package keywords
-import Dsl.Typed
 import Dsl.!!
 import Dsl.cpsApply
 import Dsl.AsKeyword

diff --git a/keywords-While/src/main/scala/com/thoughtworks/dsl/keywords/While.scala b/keywords-While/src/main/scala/com/thoughtworks/dsl/keywords/While.scala
@@ -2,7 +2,6 @@ package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
 import Dsl.cpsApply
-import Dsl.Typed
 
 case class While[
     ConditionKeyword,

diff --git a/keywords-Yield/src/main/scala/com/thoughtworks/dsl/keywords/Yield.scala b/keywords-Yield/src/main/scala/com/thoughtworks/dsl/keywords/Yield.scala
@@ -1,7 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
 import Dsl.AsKeyword
-import Dsl.Typed
 import scala.collection._
 import scala.language.implicitConversions