diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-10-25 21:20:37 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-10-27 02:11:07 +0200 |
| commit | 08ad4eaa280418164aee4f6fa7d2c4b3fbbbd3af (patch) | |
| tree | 2d3bb3ec1196bcc928e6d338c377706cf0f3bce2 /compiler/GHC/Driver | |
| parent | 0270cc54481bef9630274e77c2750940c1a4eff5 (diff) | |
| download | haskell-wip/strings-refactor2.tar.gz | |
Minor SDoc-related cleanupwip/strings-refactor2
* Rename pprCLabel to pprCLabelStyle, and use the name pprCLabel
for a function using CStyle (analogous to pprAsmLabel)
* Move LabelStyle to the CLabel module, it no longer needs to be in Outputable.
* Move calls to 'text' right next to literals, to make sure the text/str
rule is triggered.
* Remove FastString/String roundtrip in Tc.Deriv.Generate
* Introduce showSDocForUser', which abstracts over a pattern in
GHCi.UI
Diffstat (limited to 'compiler/GHC/Driver')
| -rw-r--r-- | compiler/GHC/Driver/CodeOutput.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Main.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/GHC/Driver/CodeOutput.hs b/compiler/GHC/Driver/CodeOutput.hs index 09315c4f05..448c4c864e 100644 --- a/compiler/GHC/Driver/CodeOutput.hs +++ b/compiler/GHC/Driver/CodeOutput.hs @@ -330,7 +330,7 @@ profilingInitCode platform this_mod (local_CCs, singleton_CCSs) = {-# SCC profilingInitCode #-} initializerCStub platform fn_name decls body where - pdocC = pprCLabel platform CStyle + pdocC = pprCLabel platform fn_name = mkInitializerStubLabel this_mod "prof_init" decls = vcat $ map emit_cc_decl local_CCs @@ -378,7 +378,7 @@ ipInitCode do_info_table platform this_mod body = text "registerInfoProvList" <> parens (text "&" <> ipe_buffer_label) <> semi - ipe_buffer_label = pprCLabel platform CStyle (mkIPELabel this_mod) + ipe_buffer_label = pprCLabel platform (mkIPELabel this_mod) ipe_buffer_decl = text "extern IpeBufferListNode" <+> ipe_buffer_label <> text ";" diff --git a/compiler/GHC/Driver/Main.hs b/compiler/GHC/Driver/Main.hs index a130fed062..c2e69a4087 100644 --- a/compiler/GHC/Driver/Main.hs +++ b/compiler/GHC/Driver/Main.hs @@ -2481,7 +2481,7 @@ hscTidy hsc_env guts = do -- on, print now unless (logHasDumpFlag logger Opt_D_dump_simpl) $ putDumpFileMaybe logger Opt_D_dump_rules - (renderWithContext defaultSDocContext (ppr CoreTidy <+> text "rules")) + "Tidy Core rules" FormatText (pprRulesForUser tidy_rules) |