[commit: ghc] wip/prettyprinter: Various cleanups (53efa28)

[git at git.haskell.org]

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

On branch  : wip/prettyprinter
Link       : http://ghc.haskell.org/trac/ghc/changeset/53efa284f6bb5b5835d76faeb54c9ae74b267296/ghc

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

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

    Various cleanups


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

53efa284f6bb5b5835d76faeb54c9ae74b267296
 .gitmodules          | 3 ---
 ghc/Main.hs          | 2 --
 ghc/ghc-bin.cabal.in | 2 --
 libraries/xhtml      | 2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index cfb1791..8dd0f77 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -136,9 +136,6 @@
 [submodule "hadrian"]
 	path = hadrian
 	url = ../hadrian.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 9df91b7..b720dea 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 7bc3b01..c94c6f8 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