diff options
| -rw-r--r-- | compiler/cmm/MkGraph.hs | 4 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 4 | ||||
| -rw-r--r-- | compiler/ghci/LinkerTypes.hs | 2 | ||||
| -rw-r--r-- | compiler/main/HscTypes.hs | 2 | ||||
| -rw-r--r-- | compiler/main/Packages.hs | 6 | ||||
| -rw-r--r-- | compiler/specialise/Specialise.hs | 2 | ||||
| -rw-r--r-- | compiler/stgSyn/StgSyn.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcRnTypes.hs | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/compiler/cmm/MkGraph.hs b/compiler/cmm/MkGraph.hs index 41526c7728..8beb01bc4e 100644 --- a/compiler/cmm/MkGraph.hs +++ b/compiler/cmm/MkGraph.hs @@ -335,8 +335,8 @@ copyIn dflags conv area formals extra_stk local = CmmLocal reg width = cmmRegWidth dflags local expr = CmmMachOp (MO_XX_Conv (wordWidth dflags) width) [stack_slot] - in CmmAssign local expr - + in CmmAssign local expr + | otherwise = CmmAssign (CmmLocal reg) (CmmLoad (CmmStackSlot area off) ty) where ty = localRegType reg diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index 45e5733fc1..7e26e7e118 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -526,7 +526,7 @@ closureField dflags off = off + fixedHdrSize dflags -- demonstrated that this leads to bad behavior in the presence -- of unsafeCoerce#. Returning to the above example, suppose the -- Haskell call looked like --- foo (unsafeCoerce# p) +-- foo (unsafeCoerce# p) -- where the types of expressions comprising the arguments are -- p :: (Any :: TYPE 'UnliftedRep) -- i :: Int# @@ -591,7 +591,7 @@ add_shim dflags ty expr = case ty of -- the offset of each argument when used as a C FFI argument. -- See Note [Unlifted boxed arguments to foreign calls] collectStgFArgTypes :: Type -> [StgFArgType] -collectStgFArgTypes = go [] +collectStgFArgTypes = go [] where -- Skip foralls go bs (ForAllTy _ res) = go bs res diff --git a/compiler/ghci/LinkerTypes.hs b/compiler/ghci/LinkerTypes.hs index ca578de95a..4cdfc198da 100644 --- a/compiler/ghci/LinkerTypes.hs +++ b/compiler/ghci/LinkerTypes.hs @@ -28,7 +28,7 @@ import NameEnv ( NameEnv ) import Name ( Name ) import GHCi.RemoteTypes ( ForeignHValue ) -type ClosureEnv = NameEnv (Name, ForeignHValue) +type ClosureEnv = NameEnv (Name, ForeignHValue) newtype DynLinker = DynLinker { dl_mpls :: MVar (Maybe PersistentLinkerState) } diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs index dba39c97f0..eb9877b096 100644 --- a/compiler/main/HscTypes.hs +++ b/compiler/main/HscTypes.hs @@ -443,7 +443,7 @@ data HscEnv -- time it is needed. , hsc_dynLinker :: DynLinker - -- ^ dynamic linker. + -- ^ dynamic linker. } diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 2275267d14..cdb4f9ba71 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -1470,8 +1470,8 @@ mkPackageState dflags dbs preload0 = do _ -> unit' addIfMorePreferable m unit = addToUDFM_C preferLater m (fsPackageName unit) unit -- This is the set of maximally preferable packages. In fact, it is a set of - -- most preferable *units* keyed by package name, which act as stand-ins in - -- for "a package in a database". We use units here because we don't have + -- most preferable *units* keyed by package name, which act as stand-ins in + -- for "a package in a database". We use units here because we don't have -- "a package in a database" as a type currently. mostPreferablePackageReps = if gopt Opt_HideAllPackages dflags then emptyUDFM @@ -1481,7 +1481,7 @@ mkPackageState dflags dbs preload0 = do -- with the most preferable unit for package. Being equi-preferable means that -- they must be in the same database, with the same version, and the same pacakge name. -- - -- We must take care to consider all these units and not just the most + -- We must take care to consider all these units and not just the most -- preferable one, otherwise we can end up with problems like #16228. mostPreferable u = case lookupUDFM mostPreferablePackageReps (fsPackageName u) of diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs index c1396e46c4..ed2ae073e9 100644 --- a/compiler/specialise/Specialise.hs +++ b/compiler/specialise/Specialise.hs @@ -938,7 +938,7 @@ tryWarnMissingSpecs dflags callers fn calls_for_fn | otherwise = return () where allCallersInlined = all (isAnyInlinePragma . idInlinePragma) callers - doWarn reason = + doWarn reason = warnMsg reason (vcat [ hang (text ("Could not specialise imported function") <+> quotes (ppr fn)) 2 (vcat [ text "when specialising" <+> quotes (ppr caller) diff --git a/compiler/stgSyn/StgSyn.hs b/compiler/stgSyn/StgSyn.hs index 274b0696fb..cc212c54ca 100644 --- a/compiler/stgSyn/StgSyn.hs +++ b/compiler/stgSyn/StgSyn.hs @@ -686,7 +686,7 @@ data StgOp | StgPrimCallOp PrimCall - | StgFCallOp ForeignCall Type Unique + | StgFCallOp ForeignCall Type Unique -- The Unique is occasionally needed by the C pretty-printer -- (which lacks a unique supply), notably when generating a -- typedef for foreign-export-dynamic. The Type, which is diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs index bc307568f8..0ee3d52eac 100644 --- a/compiler/typecheck/TcRnTypes.hs +++ b/compiler/typecheck/TcRnTypes.hs @@ -1020,7 +1020,7 @@ splice. In particular it is not set when the splice is renamed or typechecked. 'RunSplice' is needed to provide a reference where 'addModFinalizer' can insert the finalizer (see Note [Delaying modFinalizers in untyped splices]), and 'addModFinalizer' runs when doing Q things. Therefore, It doesn't make sense to -set 'RunSplice' when renaming or typechecking the splice, where 'Splice', +set 'RunSplice' when renaming or typechecking the splice, where 'Splice', 'Brack' or 'Comp' are used instead. -} |