diff --git a/ghc/compiler/basicTypes/OccName.lhs b/ghc/compiler/basicTypes/OccName.lhs index 98eb7c17dd30851f6198eba5be7f7ba4d701db99..76cbbb06c50c322afe3fda619835f2861f5d9c3d 100644 --- a/ghc/compiler/basicTypes/OccName.lhs +++ b/ghc/compiler/basicTypes/OccName.lhs @@ -66,19 +66,7 @@ type EncodedString = String -- Encoded form pprEncodedFS :: EncodedFS -> SDoc -pprEncodedFS fs - = getPprStyle $ \ sty -> - if userStyle sty then - let - s = decode (_UNPK_ fs) - c = head s - in - if startsVarSym c || startsConSym c then - parens (text s) - else - text s - else - ptext fs +pprEncodedFS fs = ptext fs \end{code} %************************************************************************ diff --git a/ghc/compiler/hsSyn/HsTypes.lhs b/ghc/compiler/hsSyn/HsTypes.lhs index a795a2f1ae1ad91e88285e2de91f56cd076563e3..40d50f3935c83e565b7bce5afef9702e773b351d 100644 --- a/ghc/compiler/hsSyn/HsTypes.lhs +++ b/ghc/compiler/hsSyn/HsTypes.lhs @@ -145,6 +145,9 @@ replaceTyVarName (IfaceTyVar n k) n' = IfaceTyVar n' k %* * %************************************************************************ +NB: these types get printed into interface files, so + don't change the printing format lightly + \begin{code} instance (Outputable name) => Outputable (HsType name) where ppr ty = pprHsType ty diff --git a/ghc/compiler/stranal/WorkWrap.lhs b/ghc/compiler/stranal/WorkWrap.lhs index 15736354b063dcb33d4010cad10f1d28934c27f3..87f560b575900434f8dc43628c607224cacdab7b 100644 --- a/ghc/compiler/stranal/WorkWrap.lhs +++ b/ghc/compiler/stranal/WorkWrap.lhs @@ -190,7 +190,7 @@ tryWW :: Bool -- True <=> a non-recursive binding -- if two, then a worker and a -- wrapper. tryWW non_rec fn_id rhs - | not (isNeverInlinePrag inline_prag) + | isNeverInlinePrag inline_prag = -- Don't split things that will never be inlined returnUs [ (fn_id, rhs) ]