Replace calls to `ptext . sLit` with `text`

Summary:
In the past the canonical way for constructing an SDoc string literal was the
composition `ptext . sLit`.  But for some time now we have function `text` that
does the same.  Plus it has some rules that optimize its runtime behaviour.
This patch takes all uses of `ptext . sLit` in the compiler and replaces them
with calls to `text`.  The main benefits of this patch are clener (shorter) code
and less dependencies between module, because many modules now do not need to
import `FastString`.  I don't expect any performance benefits - we mostly use
SDocs to report errors and it seems there is little to be gained here.

Test Plan: ./validate

Reviewers: bgamari, austin, goldfire, hvr, alanz

Subscribers: goldfire, thomie, mpickering

Differential Revision: https://phabricator.haskell.org/D1784

1 files changed, 5 insertions, 5 deletions

diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index 611d3964c5..46fe4e0aad 100644
--- a/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
@@ -343,16 +343,16 @@ dumpModCycles dflags mod_summaries
   = return ()
 
   | null cycles
-  = putMsg dflags (ptext (sLit "No module cycles"))
+  = putMsg dflags (text "No module cycles")
 
   | otherwise
-  = putMsg dflags (hang (ptext (sLit "Module cycles found:")) 2 pp_cycles)
+  = putMsg dflags (hang (text "Module cycles found:") 2 pp_cycles)
   where
 
     cycles :: [[ModSummary]]
     cycles = [ c | CyclicSCC c <- GHC.topSortModuleGraph True mod_summaries Nothing ]
 
-    pp_cycles = vcat [ (ptext (sLit "---------- Cycle") <+> int n <+> ptext (sLit "----------"))
+    pp_cycles = vcat [ (text "---------- Cycle" <+> int n <+> ptext (sLit "----------"))
                         $$ pprCycle c $$ blankLine
                      | (n,c) <- [1..] `zip` cycles ]
 
@@ -382,7 +382,7 @@ pprCycle summaries = pp_group (CyclicSCC summaries)
 
     pp_ms summary = text mod_str <> text (take (20 - length mod_str) (repeat ' '))
                        <+> (pp_imps empty (map snd (ms_imps summary)) $$
-                            pp_imps (ptext (sLit "{-# SOURCE #-}")) (map snd (ms_srcimps summary)))
+                            pp_imps (text "{-# SOURCE #-}") (map snd (ms_srcimps summary)))
         where
           mod_str = moduleNameString (moduleName (ms_mod summary))
 
@@ -391,7 +391,7 @@ pprCycle summaries = pp_group (CyclicSCC summaries)
     pp_imps what lms
         = case [m | L _ m <- lms, m `elem` cycle_mods] of
             [] -> empty
-            ms -> what <+> ptext (sLit "imports") <+>
+            ms -> what <+> text "imports" <+>
                                 pprWithCommas ppr ms
 
 -----------------------------------------------------------------