diff options
| -rw-r--r-- | libraries/base/GHC/Conc/Windows.hs | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/Event/EPoll.hsc | 3 | ||||
| -rw-r--r-- | libraries/base/GHC/Event/KQueue.hsc | 3 | ||||
| -rw-r--r-- | libraries/base/GHC/Event/Poll.hsc | 3 | ||||
| -rw-r--r-- | libraries/base/GHC/IO/Encoding/CodePage/API.hs | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/IO/Encoding/CodePage/Table.hs | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/Stats.hsc | 1 | ||||
| -rw-r--r-- | libraries/base/base.cabal | 1 | ||||
| -rw-r--r-- | libraries/base/codepages/MakeTable.hs | 2 |
9 files changed, 7 insertions, 12 deletions
diff --git a/libraries/base/GHC/Conc/Windows.hs b/libraries/base/GHC/Conc/Windows.hs index 41502f0f89..ad60a07d40 100644 --- a/libraries/base/GHC/Conc/Windows.hs +++ b/libraries/base/GHC/Conc/Windows.hs @@ -1,5 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples, DeriveDataTypeable #-} +{-# LANGUAGE CPP, NoImplicitPrelude, MagicHash, UnboxedTuples, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-missing-signatures #-} {-# OPTIONS_HADDOCK not-home #-} diff --git a/libraries/base/GHC/Event/EPoll.hsc b/libraries/base/GHC/Event/EPoll.hsc index 11392b1b25..fc81441291 100644 --- a/libraries/base/GHC/Event/EPoll.hsc +++ b/libraries/base/GHC/Event/EPoll.hsc @@ -1,6 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CPP - , GeneralizedNewtypeDeriving +{-# LANGUAGE GeneralizedNewtypeDeriving , NoImplicitPrelude , BangPatterns #-} diff --git a/libraries/base/GHC/Event/KQueue.hsc b/libraries/base/GHC/Event/KQueue.hsc index 74e411179c..b2132f6e9d 100644 --- a/libraries/base/GHC/Event/KQueue.hsc +++ b/libraries/base/GHC/Event/KQueue.hsc @@ -1,6 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CPP - , CApiFFI +{-# LANGUAGE CApiFFI , GeneralizedNewtypeDeriving , NoImplicitPrelude , RecordWildCards diff --git a/libraries/base/GHC/Event/Poll.hsc b/libraries/base/GHC/Event/Poll.hsc index a773498dc4..665949b786 100644 --- a/libraries/base/GHC/Event/Poll.hsc +++ b/libraries/base/GHC/Event/Poll.hsc @@ -1,6 +1,5 @@ {-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CPP - , GeneralizedNewtypeDeriving +{-# LANGUAGE GeneralizedNewtypeDeriving , NoImplicitPrelude , BangPatterns #-} diff --git a/libraries/base/GHC/IO/Encoding/CodePage/API.hs b/libraries/base/GHC/IO/Encoding/CodePage/API.hs index f45ee905d5..570ea80004 100644 --- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs +++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE NoImplicitPrelude, NondecreasingIndentation, RecordWildCards, ScopedTypeVariables #-} +{-# LANGUAGE CPP, NoImplicitPrelude, NondecreasingIndentation, RecordWildCards, ScopedTypeVariables #-} {-# OPTIONS_GHC -fno-warn-name-shadowing #-} module GHC.IO.Encoding.CodePage.API ( mkCodePageEncoding diff --git a/libraries/base/GHC/IO/Encoding/CodePage/Table.hs b/libraries/base/GHC/IO/Encoding/CodePage/Table.hs index 7e8edb93cc..eed0841b82 100644 --- a/libraries/base/GHC/IO/Encoding/CodePage/Table.hs +++ b/libraries/base/GHC/IO/Encoding/CodePage/Table.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-} +{-# LANGUAGE MagicHash, NoImplicitPrelude #-} -- Do not edit this file directly! -- It was generated by the MakeTable.hs script using the files below. -- To regenerate it, run "make" in ../../../../codepages/ diff --git a/libraries/base/GHC/Stats.hsc b/libraries/base/GHC/Stats.hsc index 2c9ecafce8..11e31b9821 100644 --- a/libraries/base/GHC/Stats.hsc +++ b/libraries/base/GHC/Stats.hsc @@ -1,5 +1,4 @@ {-# LANGUAGE Safe #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE RecordWildCards #-} {-# OPTIONS_GHC -funbox-strict-fields #-} diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index f8993df380..d74f472900 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -63,7 +63,6 @@ Library MagicHash MultiParamTypeClasses NegativeLiterals - NoBangPatterns NoImplicitPrelude NondecreasingIndentation OverlappingInstances diff --git a/libraries/base/codepages/MakeTable.hs b/libraries/base/codepages/MakeTable.hs index 0a05f85205..7b3328e2d8 100644 --- a/libraries/base/codepages/MakeTable.hs +++ b/libraries/base/codepages/MakeTable.hs @@ -200,7 +200,7 @@ compress n ms = runState (mapM lookupOrAdd chunks) (Map.empty, Map.empty) -- Static parts of the generated module. languageDirectives :: [String] -languageDirectives = ["{-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-}"] +languageDirectives = ["{-# LANGUAGE MagicHash, NoImplicitPrelude #-}"] firstComment :: [FilePath] -> [String] |