Remove Dsl.TryCatchFinally

Author: Atry

Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala

@@ -408,61 +408,6 @@ object Dsl extends LowPriorityDsl0 {
     }
   }
 
-  /** The type class to support `try` ... `catch` ... `finally` expression for
-    * `OutputDomain`.
-    *
-    * !-notation is allowed by default for `? !! Throwable` and
-    * [[scala.concurrent.Future Future]] domains, with the help of this type
-    * class.
-    */
-  @implicitNotFound(
-    "The `try` ... `catch` ... `finally` expression cannot contain !-notation inside a function that returns ${OuterDomain}."
-  )
-  @deprecated(
-    "Dsl.TryCatch / Dsl.TryFinally / Dsl.TryCatchFinally will be removed",
-    "2.0.0"
-  )
-  trait TryCatchFinally[Value, OuterDomain, BlockDomain, FinalizerDomain] {
-    def tryCatchFinally(
-        block: BlockDomain !! Value,
-        catcher: Catcher[BlockDomain !! Value],
-        finalizer: FinalizerDomain !! Unit,
-        outerSuccessHandler: Value => OuterDomain
-    ): OuterDomain
-  }
-
-  object TryCatchFinally {
-
-    implicit def fromTryCatchTryFinally[
-        Value,
-        OuterDomain,
-        BlockDomain,
-        FinalizerDomain
-    ](implicit
-        tryFinally: TryFinally[
-          Value,
-          OuterDomain,
-          BlockDomain,
-          FinalizerDomain
-        ],
-        tryCatch: TryCatch[Value, BlockDomain, BlockDomain]
-    ): TryCatchFinally[Value, OuterDomain, BlockDomain, FinalizerDomain] = {
-      (
-          block: BlockDomain !! Value,
-          catcher: Catcher[BlockDomain !! Value],
-          finalizer: FinalizerDomain !! Unit,
-          outerSuccessHandler: Value => OuterDomain
-      ) =>
-        tryFinally.tryFinally(
-          {
-            tryCatch.tryCatch(block, catcher, _)
-          },
-          finalizer,
-          outerSuccessHandler
-        )
-    }
-  }
-
   @implicitNotFound(
     "The `try` ... `catch` expression cannot contain !-notation inside a function that returns ${OuterDomain}."
   )

keywords-TryCatchFinally/src/main/scala/com/thoughtworks/dsl/keywords/TryCatchFinally.scala

@@ -9,7 +9,7 @@ case class TryCatchFinally[+BlockKeyword, +CaseKeyword, +FinalizerKeyword](
     cases: Catcher[CaseKeyword],
     finalizer: FinalizerKeyword
 ) extends Dsl.Keyword.Trait
-object TryCatchFinally extends TryCatchFinally.LegacyInstances {
+object TryCatchFinally {
   given [
       Value,
       OuterDomain,
@@ -38,42 +38,4 @@ object TryCatchFinally extends TryCatchFinally.LegacyInstances {
         ) =>
       TryFinally(TryCatch(block, catcher), finalizer).cpsApply(handler)
   }
-
-  trait LegacyInstances:
-    @deprecated(
-      "Dsl.TryCatch / Dsl.TryFinally / Dsl.TryCatchFinally will be removed",
-      "2.0.0"
-    )
-    given [
-        Value,
-        OuterDomain,
-        BlockKeyword,
-        BlockDomain,
-        CaseKeyword,
-        FinalizerKeyword,
-        FinalizerDomain
-    ](using
-        dslTryCatchFinally: Dsl.TryCatchFinally[
-          Value,
-          OuterDomain,
-          BlockDomain,
-          FinalizerDomain
-        ],
-        blockDsl: Dsl.Searching[BlockKeyword, BlockDomain, Value],
-        caseDsl: Dsl.Searching[CaseKeyword, BlockDomain, Value],
-        finalizerDsl: Dsl.Searching[FinalizerKeyword, FinalizerDomain, Unit]
-    ): Dsl.Composed[TryCatchFinally[
-      BlockKeyword,
-      CaseKeyword,
-      FinalizerKeyword
-    ], OuterDomain, Value] = Dsl.Composed {
-      case (TryCatchFinally(blockKeyword, cases, finalizerKeyword), handler) =>
-        dslTryCatchFinally.tryCatchFinally(
-          blockDsl(blockKeyword, _),
-          cases.andThen { caseKeyword => caseDsl(caseKeyword, _) },
-          finalizerDsl(finalizerKeyword, _),
-          handler
-        )
-    }
-
 }