Remove tabs, so that I can push.

5 files changed, 37 insertions, 58 deletions

diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index 93a1dc1e52..f1318c1dc9 100644
--- a/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
@@ -1,14 +1,6 @@
 -- Cmm representations using Hoopl's Graph CmmNode e x.
 {-# LANGUAGE GADTs #-}
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-
-{-# OPTIONS -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
 {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
 #if __GLASGOW_HASKELL__ >= 703
 -- GHC 7.0.1 improved incomplete pattern warnings with GADTs
@@ -137,7 +129,7 @@ data ProfilingInfo
 -- we add a label for the table, and expect only the 'offset/length' form
 
 data C_SRT = NoC_SRT
-	   | C_SRT !CLabel !WordOff !StgHalfWord {-bitmap or escape-}
+           | C_SRT !CLabel !WordOff !StgHalfWord {-bitmap or escape-}
            deriving (Eq)
 
 needsSRT :: C_SRT -> Bool
diff --git a/compiler/stgSyn/StgLint.lhs b/compiler/stgSyn/StgLint.lhs
index d54294f4f3..d1c4ae3ad9 100644
--- a/compiler/stgSyn/StgLint.lhs
+++ b/compiler/stgSyn/StgLint.lhs
@@ -4,13 +4,6 @@
 \section[StgLint]{A ``lint'' pass to check for Stg correctness}
 
 \begin{code}
-{-# OPTIONS -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
 module StgLint ( lintStgBindings ) where
 
 import StgSyn
@@ -121,10 +114,10 @@ lint_binds_help (binder, rhs)
                (mkUnLiftedTyMsg binder rhs)
 
         -- Check match to RHS type
-	-- Actually we *can't* check the RHS type, because
-	-- unsafeCoerce means it really might not match at all
-	-- notably;  eg x::Int = (error @Bool "urk") |> unsafeCoerce...
-	-- case maybe_rhs_ty of
+        -- Actually we *can't* check the RHS type, because
+        -- unsafeCoerce means it really might not match at all
+        -- notably;  eg x::Int = (error @Bool "urk") |> unsafeCoerce...
+        -- case maybe_rhs_ty of
         --  Nothing     -> return ()
         --    Just rhs_ty -> checkTys binder_ty
         --                          rhs_ty
@@ -237,8 +230,8 @@ lintStgAlts alts scrut_ty = do
                            return (Just first_ty)
         where
           -- check ty = checkTys first_ty ty (mkCaseAltMsg alts)
-	  -- We can't check that the alternatives have the
-	  -- same type, becuase they don't, with unsafeCoerce#
+          -- We can't check that the alternatives have the
+          -- same type, becuase they don't, with unsafeCoerce#
 
 lintAlt :: Type -> (AltCon, [Id], [Bool], StgExpr) -> LintM (Maybe Type)
 lintAlt _ (DEFAULT, _, _, rhs)
@@ -398,8 +391,8 @@ checkFunApp fun_ty arg_tys msg
  where
   (mb_ty, mb_msg) = cfa True fun_ty arg_tys
 
-  cfa :: Bool -> Type -> [Type] -> (Maybe Type		-- Accurate result?
-                                   , Maybe Message)	-- Errors?
+  cfa :: Bool -> Type -> [Type] -> (Maybe Type        -- Accurate result?
+                                   , Maybe Message)   -- Errors?
 
   cfa accurate fun_ty []      -- Args have run out; that's fine
       = (if accurate then Just fun_ty else Nothing, Nothing)
@@ -446,12 +439,12 @@ stgEqType orig_ty1 orig_ty2
       | Just (tc1, tc_args1) <- splitTyConApp_maybe ty1
       , Just (tc2, tc_args2) <- splitTyConApp_maybe ty2
       , let res = if tc1 == tc2 
-        	  then equalLength tc_args1 tc_args2 
-        	    && and (zipWith go tc_args1 tc_args2)
-        	  else  -- TyCons don't match; but don't bleat if either is a 
-    		        -- family TyCon because a coercion might have made it 
-        	        -- equal to something else
-        	    (isFamilyTyCon tc1 || isFamilyTyCon tc2)
+              then equalLength tc_args1 tc_args2 
+                && and (zipWith go tc_args1 tc_args2)
+              else  -- TyCons don't match; but don't bleat if either is a 
+                    -- family TyCon because a coercion might have made it 
+                    -- equal to something else
+                (isFamilyTyCon tc1 || isFamilyTyCon tc2)
       = if res then True
         else 
         pprTrace "stgEqType: unequal" (vcat [ppr orig_ty1, ppr orig_ty2, ppr rep_ty1
@@ -459,7 +452,7 @@ stgEqType orig_ty1 orig_ty2
         False
 
       | otherwise = True  -- Conservatively say "fine".  
-      		    	  -- Type variables in particular
+                          -- Type variables in particular
 
 checkInScope :: Id -> LintM ()
 checkInScope id = LintM $ \loc scope errs
diff --git a/compiler/utils/ListSetOps.lhs b/compiler/utils/ListSetOps.lhs
index 2c6c6b0b6c..84e17cc825 100644
--- a/compiler/utils/ListSetOps.lhs
+++ b/compiler/utils/ListSetOps.lhs
@@ -5,12 +5,6 @@
 \section[ListSetOps]{Set-like operations on lists}
 
 \begin{code}
-{-# OPTIONS -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
 
 module ListSetOps (
         unionLists, minusList, insertList,
@@ -24,9 +18,9 @@ module ListSetOps (
         hasNoDups, runs, removeDups, findDupsEq,
         equivClasses, equivClassesByUniq,
 
-	-- Remove redudant elts
-	removeRedundant	   -- Used in the ghc/InteractiveUI, 
-			   -- although not in the compiler itself
+        -- Remove redudant elts
+        removeRedundant   -- Used in the ghc/InteractiveUI, 
+                          -- although not in the compiler itself
    ) where
 
 #include "HsVersions.h"
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 86bb73ed60..688cd02a80 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -9,7 +9,7 @@ SRC_CC_OPTS     += -Wall $(WERROR)
 # Debian doesn't turn -Werror=unused-but-set-variable on by default, so
 # we turn it on explicitly for consistency with other users
 ifeq "$(GccLT46)" "NO"
-SRC_CC_OPTS	    += -Werror=unused-but-set-variable
+SRC_CC_OPTS     += -Werror=unused-but-set-variable
 # gcc 4.6 gives 3 warning for giveCapabilityToTask not being inlined
 SRC_CC_OPTS     += -Wno-error=inline
 endif
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 7b516371e2..2e5f76462b 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -28,40 +28,40 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
 #  Variable              Purpose                           Defined by
 #  --------------        ------------------------------    --------------
 #  $1_PACKAGE            Package name for this dir,        $1/$2/ghc.mk
-#                        if it is a package		   
-#							   
+#                        if it is a package   
+#   
 #  CONF_HC_OPTS          GHC options from ./configure      mk/config.mk.in
-#							   
+#   
 #  CONF_HC_OPTS_STAGE$4  GHC options from ./configure      mk/config.mk.in
-#                        specific to stage $4		   
-#							   
+#                        specific to stage $4   
+#   
 #  WAY_$3_HC_OPTS        GHC options specific to way $3    mk/ways.mk
-#							   
+#   
 #  SRC_HC_OPTS           source-tree-wide GHC options      mk/config.mk.in
 #                                                          mk/build.mk
 #                                                          mk/validate.mk
-#							   
+#   
 #  EXTRA_HC_OPTS         for supplying extra options on    make EXTRA_HC_OPTS=...
-#                        the command line		   
-#							   
+#                        the command line   
+#   
 #  $1_HC_OPTS            GHC options specific to this      $1/$2/package-data.mk
 #                        dir
-#							   
+#   
 #  $1_$2_HC_OPTS         GHC options specific to this      $1/$2/package-data.mk
 #                        dir and distdir
-#							   
+#   
 #  $1_$2_$3_HC_OPTS      GHC options specific to this      $1/$2/package-data.mk
 #                        dir, distdir and way
-#							   
+#   
 #  $1_$2_MORE_HC_OPTS    GHC options for this dir/distdir  ???
-#							   
+#   
 #  $1_$2_EXTRA_HC_OPTS   GHC options for this dir/distdir  mk/build.mk
-#							   
+#   
 #  $1_$2_HC_PKGCONF      -package-conf flag if necessary   rules/package-config.mk
-#							   
+#   
 #  $1_$2_HS_SRC_DIRS     dirs relative to $1 containing    $1/$2/package-data.mk
-#                        source files			   
-#							   
+#                        source files   
+#   
 #  $1_$2_CPP_OPTS        CPP options                       $1/$2/package-data.mk
 #  
 #  <file>_HC_OPTS        GHC options for this source       $1/$2/ghc.mk