[commit: ghc] wip/prettyprinter: Various cleanups (52c609b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/prettyprinter
Link       : http://ghc.haskell.org/trac/ghc/changeset/52c609bcc80082c397d70d37793ecefa1ee6ba4e/ghc

>---------------------------------------------------------------

commit 52c609bcc80082c397d70d37793ecefa1ee6ba4e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Sep 12 06:45:44 2017 -0400

    Various cleanups


>---------------------------------------------------------------

52c609bcc80082c397d70d37793ecefa1ee6ba4e
 .gitmodules          | 7 -------
 ghc/Main.hs          | 2 --
 ghc/ghc-bin.cabal.in | 2 --
 libraries/xhtml      | 2 +-
 utils/haddock        | 2 +-
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9bf1d27..70924fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = libraries/bytestring
 	url = ../packages/bytestring.git
 	ignore = untracked
-[submodule "libraries/text"]
-	path = libraries/text
-	url = https://github.com/bollu/text.git
-	ignore = untracked
 [submodule "libraries/Cabal"]
 	path = libraries/Cabal
 	url = ../packages/Cabal.git
@@ -133,9 +129,6 @@
 [submodule ".arc-linters/arcanist-external-json-linter"]
 	path = .arc-linters/arcanist-external-json-linter
 	url = ../arcanist-external-json-linter.git
-[submodule "libraries/prettyprinter-core"]
-	path = libraries/prettyprinter-core
-	url = https://github.com/bollu/prettyprinter-core.git
 [submodule "libraries/prettyprinter"]
 	path = libraries/prettyprinter
 	url = git at github.com:quchen/prettyprinter.git
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 8919649..a75aba3 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -73,8 +73,6 @@ import Control.Monad
 import Data.Char
 import Data.List
 import Data.Maybe
-import qualified Data.Text as DontUseText
-import qualified Data.Text.Prettyprint.Doc as DontUsePrettyPrint
 
 -----------------------------------------------------------------------------
 -- ToDo:
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 385c9f2a..5fe7c9d 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -34,8 +34,6 @@ Executable ghc
                    directory  >= 1   && < 1.4,
                    process    >= 1   && < 1.7,
                    filepath   >= 1   && < 1.5,
-                   text       == 1.2.*,
-                   prettyprinter == 1.1.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc        == @ProjectVersionMunged@
 
diff --git a/libraries/xhtml b/libraries/xhtml
index c5c623e..6358594 160000
--- a/libraries/xhtml
+++ b/libraries/xhtml
@@ -1 +1 @@
-Subproject commit c5c623e497f13ec187e0d228e0e8a3d9ee39a715
+Subproject commit 6358594eb5139f6760e2ada72718d69fed5a1015
diff --git a/utils/haddock b/utils/haddock
index 5fa4ef3..4540679 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 5fa4ef3028dfded480f7d54e4c736862e8892223
+Subproject commit 4540679027e9ca458823fdbdcc7ccdfb92a1f69a