Remove LANGUAGE pragrams implied by Haskell2010

Haskell2010 implies (at least) EmptyDataDecls, ForeignFunctionInterface, PatternGuards, DoAndIfThenElse, and RelaxedPolyRec. This is a follow-up to dd92e21 Signed-off-by: Herbert Valerio Riedel <[email protected]>
chpatrick · May 14, 2014 · 88c0870 · 88c0870
1 parent dd92e21
commit 88c0870
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 16 deletions.
diff --git a/compiler/cmm/Hoopl/Dataflow.hs b/compiler/cmm/Hoopl/Dataflow.hs
@@ -9,7 +9,7 @@
 -- specialised to the UniqSM monad.
 --
 
-{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, TypeFamilies, MultiParamTypeClasses #-}
 {-# OPTIONS_GHC -fprof-auto-top #-}
 {-# LANGUAGE Trustworthy #-}
 

diff --git a/distrib/compare/Makefile b/distrib/compare/Makefile
@@ -2,7 +2,7 @@
 GHC = ghc
 
 compare: *.hs
-	"$(GHC)" -O --make -Wall -Werror $@
+	"$(GHC)" -O -XHaskell2010 --make -Wall -Werror $@
 
 .PHONY: clean
 clean:

diff --git a/distrib/compare/compare.hs b/distrib/compare/compare.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE PatternGuards #-}
-
 module Main (main) where
 
 import Control.Monad.State

diff --git a/ghc/Main.hs b/ghc/Main.hs
@@ -1,5 +1,4 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
 
 -----------------------------------------------------------------------------
 --

diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs
@@ -1,6 +1,5 @@
 
-{-# LANGUAGE CPP, MagicHash, ForeignFunctionInterface,
-             NoImplicitPrelude, BangPatterns, UnboxedTuples,
+{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude, BangPatterns, UnboxedTuples,
              UnliftedFFITypes #-}
 
 -- Commentary of Integer library is located on the wiki:

diff --git a/utils/checkUniques/Makefile b/utils/checkUniques/Makefile
@@ -13,4 +13,4 @@ check: checkUniques
 	./checkUniques mkPreludeMiscIdUnique  $(PREL_NAMES) $(DS_META)
 
 checkUniques: checkUniques.hs
-	$(GHC) --make $@
+	$(GHC) -O -XHaskell2010 --make $@
diff --git a/utils/checkUniques/checkUniques.hs b/utils/checkUniques/checkUniques.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE PatternGuards #-}
-
 -- Some things could be improved, e.g.:
 -- * Check that each file given contains at least one instance of the
 --   function

diff --git a/utils/dll-split/Main.hs b/utils/dll-split/Main.hs
@@ -1,6 +1,3 @@
-
-{-# LANGUAGE PatternGuards #-}
-
 module Main (main) where
 
 import Control.Monad

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternGuards, CPP, ForeignFunctionInterface #-}
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 --
 -- (c) The University of Glasgow 2004-2009.

diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternGuards, ScopedTypeVariables #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module Main where
 
 import Prelude hiding ( mod, id, mapM )

diff --git a/utils/runghc/runghc.hs b/utils/runghc/runghc.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, ForeignFunctionInterface #-}
+{-# LANGUAGE CPP #-}
 #include "ghcconfig.h"
 -----------------------------------------------------------------------------
 --