From 3ead4853866869ab70de47e2386a09e23aedd9fb Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Thu, 14 May 2026 17:47:22 +0200 Subject: [PATCH] Remove legacy Data.Text.Prettyprint.* modules Resolves #281. --- .../prettyprinter-ansi-terminal.cabal | 4 +--- .../Text/Prettyprint/Doc/Render/Terminal.hs | 6 ------ .../Doc/Render/Terminal/Internal.hs | 7 ------- ...prettyprinter-convert-ansi-wl-pprint.cabal | 3 +-- .../Text/Prettyprint/Convert/AnsiWlPprint.hs | 5 ----- prettyprinter/prettyprinter.cabal | 20 +------------------ .../src/Data/Text/Prettyprint/Doc.hs | 5 ----- .../src/Data/Text/Prettyprint/Doc/Internal.hs | 5 ----- .../Text/Prettyprint/Doc/Internal/Debug.hs | 5 ----- .../Text/Prettyprint/Doc/Internal/Type.hs | 8 -------- .../Text/Prettyprint/Doc/Render/String.hs | 5 ----- .../Data/Text/Prettyprint/Doc/Render/Text.hs | 5 ----- .../Render/Tutorials/StackMachineTutorial.hs | 7 ------- .../Render/Tutorials/TreeRenderingTutorial.hs | 5 ----- .../Text/Prettyprint/Doc/Render/Util/Panic.hs | 5 ----- .../Doc/Render/Util/SimpleDocTree.hs | 5 ----- .../Doc/Render/Util/StackMachine.hs | 8 -------- .../Text/Prettyprint/Doc/Symbols/Ascii.hs | 5 ----- .../Text/Prettyprint/Doc/Symbols/Unicode.hs | 5 ----- .../src/Data/Text/Prettyprint/Doc/Util.hs | 8 -------- 20 files changed, 3 insertions(+), 123 deletions(-) delete mode 100644 prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal.hs delete mode 100644 prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal/Internal.hs delete mode 100644 prettyprinter-convert-ansi-wl-pprint/src/Data/Text/Prettyprint/Convert/AnsiWlPprint.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc.hs delete mode 100755 prettyprinter/src/Data/Text/Prettyprint/Doc/Internal.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Debug.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Type.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/String.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Text.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/StackMachineTutorial.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/TreeRenderingTutorial.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/Panic.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/SimpleDocTree.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/StackMachine.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Ascii.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Unicode.hs delete mode 100644 prettyprinter/src/Data/Text/Prettyprint/Doc/Util.hs diff --git a/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal b/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal index c7e1f4ca..880cdb79 100644 --- a/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal +++ b/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal @@ -30,9 +30,7 @@ flag text manual: True library - exposed-modules: Data.Text.Prettyprint.Doc.Render.Terminal - , Data.Text.Prettyprint.Doc.Render.Terminal.Internal - , Prettyprinter.Render.Terminal + exposed-modules: Prettyprinter.Render.Terminal , Prettyprinter.Render.Terminal.Internal ghc-options: -Wall -O2 -Wcompat hs-source-dirs: src diff --git a/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal.hs b/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal.hs deleted file mode 100644 index 9843858b..00000000 --- a/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Terminal {-# DEPRECATED "Use \"Prettyprinter.Render.Terminal\" instead." #-} ( - module Prettyprinter.Render.Terminal -) where - -import Prettyprinter.Render.Terminal - diff --git a/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal/Internal.hs b/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal/Internal.hs deleted file mode 100644 index 47909960..00000000 --- a/prettyprinter-ansi-terminal/src/Data/Text/Prettyprint/Doc/Render/Terminal/Internal.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Terminal.Internal {-# DEPRECATED "Use \"Prettyprinter.Render.Terminal.Internal\" instead." #-} ( - module Prettyprinter.Render.Terminal.Internal -) where - -import Prettyprinter.Render.Terminal.Internal - - diff --git a/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal b/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal index 0746fb32..c5e7451c 100644 --- a/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal +++ b/prettyprinter-convert-ansi-wl-pprint/prettyprinter-convert-ansi-wl-pprint.cabal @@ -19,8 +19,7 @@ source-repository head location: https://github.com/quchen/prettyprinter library - exposed-modules: Data.Text.Prettyprint.Convert.AnsiWlPprint - , Prettyprinter.Convert.AnsiWlPprint + exposed-modules: Prettyprinter.Convert.AnsiWlPprint ghc-options: -Wall hs-source-dirs: src default-language: Haskell2010 diff --git a/prettyprinter-convert-ansi-wl-pprint/src/Data/Text/Prettyprint/Convert/AnsiWlPprint.hs b/prettyprinter-convert-ansi-wl-pprint/src/Data/Text/Prettyprint/Convert/AnsiWlPprint.hs deleted file mode 100644 index 25c98284..00000000 --- a/prettyprinter-convert-ansi-wl-pprint/src/Data/Text/Prettyprint/Convert/AnsiWlPprint.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Convert.AnsiWlPprint {-# DEPRECATED "Use \"Prettyprinter.Convert.AnsiWlPprint\" instead." #-} ( - module Prettyprinter.Convert.AnsiWlPprint -) where - -import Prettyprinter.Convert.AnsiWlPprint diff --git a/prettyprinter/prettyprinter.cabal b/prettyprinter/prettyprinter.cabal index 5b6999d5..e52510e1 100644 --- a/prettyprinter/prettyprinter.cabal +++ b/prettyprinter/prettyprinter.cabal @@ -34,27 +34,9 @@ library , Prettyprinter.Render.Util.Panic , Prettyprinter.Render.Util.SimpleDocTree , Prettyprinter.Render.Util.StackMachine - , Prettyprinter.Util - , Prettyprinter.Symbols.Unicode , Prettyprinter.Symbols.Ascii - - , Data.Text.Prettyprint.Doc - , Data.Text.Prettyprint.Doc.Internal - , Data.Text.Prettyprint.Doc.Internal.Debug - , Data.Text.Prettyprint.Doc.Internal.Type - , Data.Text.Prettyprint.Doc.Render.String - , Data.Text.Prettyprint.Doc.Render.Text - , Data.Text.Prettyprint.Doc.Render.Tutorials.StackMachineTutorial - , Data.Text.Prettyprint.Doc.Render.Tutorials.TreeRenderingTutorial - , Data.Text.Prettyprint.Doc.Render.Util.Panic - , Data.Text.Prettyprint.Doc.Render.Util.SimpleDocTree - , Data.Text.Prettyprint.Doc.Render.Util.StackMachine - , Data.Text.Prettyprint.Doc.Util - - , Data.Text.Prettyprint.Doc.Symbols.Unicode - , Data.Text.Prettyprint.Doc.Symbols.Ascii - + , Prettyprinter.Util ghc-options: -Wall -O2 -Wcompat hs-source-dirs: src include-dirs: misc diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc.hs deleted file mode 100644 index 0da3f2b1..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc {-# DEPRECATED "Use \"Prettyprinter\" instead." #-} ( - module Prettyprinter -) where - -import Prettyprinter diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal.hs deleted file mode 100755 index 8fcfe479..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Internal {-# DEPRECATED "Use \"Prettyprinter.Internal\" instead." #-} ( - module Prettyprinter.Internal -) where - -import Prettyprinter.Internal diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Debug.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Debug.hs deleted file mode 100644 index 11659431..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Debug.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Internal.Debug {-# DEPRECATED "Use \"Prettyprinter.Internal.Debug\" instead." #-} ( - module Prettyprinter.Internal.Debug -) where - -import Prettyprinter.Internal.Debug diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Type.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Type.hs deleted file mode 100644 index b5ff2016..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Internal/Type.hs +++ /dev/null @@ -1,8 +0,0 @@ -module Data.Text.Prettyprint.Doc.Internal.Type {-# DEPRECATED "Use \"Prettyprinter.Internal.Type\" instead." #-} ( - module Prettyprinter.Internal.Type -) where - -import Prettyprinter.Internal.Type - - - diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/String.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/String.hs deleted file mode 100644 index a4ca2d71..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/String.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.String {-# DEPRECATED "Use \"Prettyprinter.Render.String\" instead." #-} ( - module Prettyprinter.Render.String -) where - -import Prettyprinter.Render.String diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Text.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Text.hs deleted file mode 100644 index 8b924313..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Text.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Text {-# DEPRECATED "Use \"Prettyprinter.Render.Text\" instead." #-} ( - module Prettyprinter.Render.Text -) where - -import Prettyprinter.Render.Text diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/StackMachineTutorial.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/StackMachineTutorial.hs deleted file mode 100644 index 065a3a47..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/StackMachineTutorial.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Tutorials.StackMachineTutorial {-# DEPRECATED "Use \"Prettyprinter.Render.Tutorials.StackMachineTutorial\" instead." #-} ( - module Prettyprinter.Render.Tutorials.StackMachineTutorial -) where - --- Yeah, this produces a deprecation warning. It's hard to disable it while --- staying compatible with GHC < 8.0 though. Don't waste your time. -import Prettyprinter.Render.Tutorials.StackMachineTutorial diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/TreeRenderingTutorial.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/TreeRenderingTutorial.hs deleted file mode 100644 index 02bc4b26..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Tutorials/TreeRenderingTutorial.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Tutorials.TreeRenderingTutorial {-# DEPRECATED "Use \"Prettyprinter.Render.Tutorials.TreeRenderingTutorial\" instead." #-} ( - module Prettyprinter.Render.Tutorials.TreeRenderingTutorial -) where - -import Prettyprinter.Render.Tutorials.TreeRenderingTutorial diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/Panic.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/Panic.hs deleted file mode 100644 index 31ecb4e9..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/Panic.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Util.Panic {-# DEPRECATED "Use \"Prettyprinter.Render.Util.Panic\" instead." #-} ( - module Prettyprinter.Render.Util.Panic -) where - -import Prettyprinter.Render.Util.Panic diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/SimpleDocTree.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/SimpleDocTree.hs deleted file mode 100644 index 5c8adb02..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/SimpleDocTree.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Util.SimpleDocTree {-# DEPRECATED "Use \"Prettyprinter.Render.Util.SimpleDocTree\" instead." #-} ( - module Prettyprinter.Render.Util.SimpleDocTree -) where - -import Prettyprinter.Render.Util.SimpleDocTree diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/StackMachine.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/StackMachine.hs deleted file mode 100644 index 356921be..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Render/Util/StackMachine.hs +++ /dev/null @@ -1,8 +0,0 @@ -module Data.Text.Prettyprint.Doc.Render.Util.StackMachine {-# DEPRECATED "Use \"Prettyprinter.Render.Util.StackMachine\" instead." #-} ( - module Prettyprinter.Render.Util.StackMachine -) where - -import Prettyprinter.Render.Util.StackMachine - - - diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Ascii.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Ascii.hs deleted file mode 100644 index 8a89b972..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Ascii.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Symbols.Ascii {-# DEPRECATED "Use \"Prettyprinter.Symbols.Ascii\" instead." #-} ( - module Prettyprinter.Symbols.Ascii -) where - -import Prettyprinter.Symbols.Ascii diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Unicode.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Unicode.hs deleted file mode 100644 index 9dc6c6dc..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Symbols/Unicode.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Data.Text.Prettyprint.Doc.Symbols.Unicode {-# DEPRECATED "Use \"Prettyprinter.Symbols.Unicode\" instead." #-} ( - module Prettyprinter.Symbols.Unicode -) where - -import Prettyprinter.Symbols.Unicode diff --git a/prettyprinter/src/Data/Text/Prettyprint/Doc/Util.hs b/prettyprinter/src/Data/Text/Prettyprint/Doc/Util.hs deleted file mode 100644 index e2b5ed8f..00000000 --- a/prettyprinter/src/Data/Text/Prettyprint/Doc/Util.hs +++ /dev/null @@ -1,8 +0,0 @@ -module Data.Text.Prettyprint.Doc.Util {-# DEPRECATED "Use \"Prettyprinter.Util\" instead." #-} ( - module Prettyprinter.Util -) where - -import Prettyprinter.Util - - -