Commit 164371dd authored by dterei's avatar dterei

Consistent import of Text.PrettyPrint

parent 927fbed3
......@@ -56,9 +56,9 @@ import Distribution.Simple.Utils
import qualified Distribution.Compat.ReadP as Parse
( ReadP, pfail, munch1, skipSpaces )
import qualified Text.PrettyPrint.HughesPJ as Disp
import qualified Text.PrettyPrint as Disp
( Doc, render, char, text )
import Text.PrettyPrint.HughesPJ
import Text.PrettyPrint
( (<+>), (<>) )
import Data.List
......
......@@ -19,7 +19,7 @@ import qualified Distribution.Text as Text
import qualified Distribution.Compat.ReadP as Parse
( pfail, munch1 )
import qualified Text.PrettyPrint.HughesPJ as Disp
import qualified Text.PrettyPrint as Disp
( text )
import Data.Char as Char
......
......@@ -76,9 +76,9 @@ import Control.Monad
import qualified Data.Map as Map
import qualified Distribution.Compat.ReadP as Parse
( option )
import qualified Text.PrettyPrint.HughesPJ as Disp
import qualified Text.PrettyPrint as Disp
( Doc, render, text, colon, vcat, empty, isEmpty, nest )
import Text.PrettyPrint.HughesPJ
import Text.PrettyPrint
( (<>), (<+>), ($$), ($+$) )
import System.Directory
( createDirectoryIfMissing, getAppUserDataDirectory )
......
......@@ -41,7 +41,7 @@ import Control.Monad
( (>=>), join )
#endif
import Text.PrettyPrint.HughesPJ hiding (mode, cat)
import Text.PrettyPrint hiding (mode, cat)
import Data.Version
( Version(..) )
......
......@@ -65,7 +65,7 @@ import Control.Monad
( MonadPlus(mplus), join )
import Control.Exception
( assert )
import Text.PrettyPrint.HughesPJ as Disp
import Text.PrettyPrint as Disp
import System.Directory
( doesDirectoryExist )
......
......@@ -115,7 +115,7 @@ import Data.List (nub, intersperse)
import Data.Maybe (maybeToList)
import Data.Monoid (Monoid(mempty, mappend))
import Control.Monad (MonadPlus(mplus))
import Text.PrettyPrint.HughesPJ as Disp
import Text.PrettyPrint as Disp
import qualified Distribution.Compat.ReadP as Parse
import qualified Data.Char as Char (isAlphaNum, isDigit, toLower)
......
......@@ -79,7 +79,7 @@ import Distribution.Text
( Text(disp, parse), display, simpleParse )
import Distribution.Compat.ReadP
((+++), option)
import Text.PrettyPrint.HughesPJ
import Text.PrettyPrint
import Distribution.ParseUtils hiding (parseFields)
import Distribution.PackageDescription
......
......@@ -81,7 +81,7 @@ import Distribution.Simple.Utils
import Language.Haskell.Extension
( Language, Extension )
import Text.PrettyPrint.HughesPJ hiding (braces)
import Text.PrettyPrint hiding (braces)
import Data.Char (isSpace, toLower, isAlphaNum, isDigit)
import Data.Maybe (fromMaybe)
import Data.Tree as Tree (Tree(..), flatten)
......
......@@ -94,7 +94,7 @@ import Distribution.Text
import Distribution.ParseUtils
import Distribution.ReadE
import Distribution.Simple.Utils (die, intercalate)
import Text.PrettyPrint.HughesPJ ( punctuate, cat, comma, text, empty)
import Text.PrettyPrint ( punctuate, cat, comma, text, empty)
data CommandUI flags = CommandUI {
-- | The name of the command as it would be entered on the command line.
......
......@@ -146,7 +146,7 @@ import System.IO
( hPutStrLn, stderr, hClose )
import Distribution.Text
( Text(disp), display, simpleParse )
import Text.PrettyPrint.HughesPJ
import Text.PrettyPrint
( comma, punctuate, render, nest, sep )
import Distribution.Compat.Exception ( catchExit, catchIO )
......
......@@ -51,7 +51,7 @@ import Distribution.Compat.ReadP as ReadP hiding (get)
import Distribution.Simple.Utils (intercalate)
import Language.Haskell.Extension (Extension)
import Text.PrettyPrint.HughesPJ hiding (braces)
import Text.PrettyPrint hiding (braces)
import Data.Char (isSpace, isUpper, toLower, isAlphaNum, isSymbol, isDigit)
import Data.Maybe (fromMaybe)
import Data.Tree as Tree (Tree(..), flatten)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment