summaryrefslogtreecommitdiff
path: root/compiler/GHC/Tc/Deriv.hs
diff options
context:
space:
mode:
authorKrzysztof Gogolewski <krzysztof.gogolewski@tweag.io>2022-10-25 21:20:37 +0200
committerKrzysztof Gogolewski <krzysztof.gogolewski@tweag.io>2022-10-27 02:11:07 +0200
commit08ad4eaa280418164aee4f6fa7d2c4b3fbbbd3af (patch)
tree2d3bb3ec1196bcc928e6d338c377706cf0f3bce2 /compiler/GHC/Tc/Deriv.hs
parent0270cc54481bef9630274e77c2750940c1a4eff5 (diff)
downloadhaskell-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/Tc/Deriv.hs')
-rw-r--r--compiler/GHC/Tc/Deriv.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/GHC/Tc/Deriv.hs b/compiler/GHC/Tc/Deriv.hs
index feefb05ac1..8284aba4f7 100644
--- a/compiler/GHC/Tc/Deriv.hs
+++ b/compiler/GHC/Tc/Deriv.hs
@@ -201,7 +201,6 @@ tcDeriving deriv_infos deriv_decls
; famInsts2 <- concatMapM genFamInsts infer_specs
; let famInsts = famInsts1 ++ famInsts2
- ; dflags <- getDynFlags
; logger <- getLogger
-- We must put all the derived type family instances (from both
@@ -229,7 +228,7 @@ tcDeriving deriv_infos deriv_decls
; let (_, aux_specs, fvs) = unzip3 (given_inst_binds ++ infer_inst_binds)
; loc <- getSrcSpanM
- ; let aux_binds = genAuxBinds dflags loc (unionManyBags aux_specs)
+ ; let aux_binds = genAuxBinds loc (unionManyBags aux_specs)
; let infer_inst_infos = map fstOf3 infer_inst_binds
; let inst_infos = given_inst_infos ++ infer_inst_infos