summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2019-06-07 14:33:13 +0100
committerBen Gamari <ben@well-typed.com>2019-06-08 13:38:15 -0400
commit709290b01c3c63137d863d6fdd97dabdfe47eb29 (patch)
treef481fb176d0e8f31cf802ff4211ea2e660f1f1f5
parentc392f987de174ae04c6c7c47145dfe5db6427615 (diff)
downloadhaskell-709290b01c3c63137d863d6fdd97dabdfe47eb29.tar.gz
Remove trailing whitespace
[skip ci] This should really be caught by the linters! (#16711)
-rw-r--r--compiler/cmm/MkGraph.hs4
-rw-r--r--compiler/codeGen/StgCmmForeign.hs4
-rw-r--r--compiler/ghci/LinkerTypes.hs2
-rw-r--r--compiler/main/HscTypes.hs2
-rw-r--r--compiler/main/Packages.hs6
-rw-r--r--compiler/specialise/Specialise.hs2
-rw-r--r--compiler/stgSyn/StgSyn.hs2
7 files changed, 11 insertions, 11 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