summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-07-04 18:20:06 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-07-05 00:00:16 +0200
commitc875b085d95377771a5b3cf0f44bb2910dbfe966 (patch)
tree82956f75c4e61e62707b31cb0742d11a0a8f26c7 /compiler
parentaa778c8e5142b5a30905be12062cf443268db7ae (diff)
downloadhaskell-c875b085d95377771a5b3cf0f44bb2910dbfe966.tar.gz
Use -fno-warn-unused-imports instead of hiding `ord`
This is more future proof. Maybe later versions of Alex won't `import Data.Char (ord)` anymore.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/cmm/CmmLex.x3
-rw-r--r--compiler/parser/Lexer.x3
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index cb71c7d7de..fca5a1eee8 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -13,6 +13,7 @@
{
{-# OPTIONS_GHC -fno-warn-unused-matches #-}
{-# OPTIONS_GHC -fno-warn-unused-binds #-}
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
{-# OPTIONS_GHC -fno-warn-tabs #-}
{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-- The above warning suppression flags are a temporary kludge.
@@ -37,7 +38,7 @@ import Util
--import TRACE
import Data.Word
-import Data.Char hiding (ord)
+import Data.Char
}
$whitechar = [\ \t\n\r\f\v\xa0] -- \xa0 is Unicode no-break space
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 8e6e67d8d1..df7347e85a 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -45,6 +45,7 @@
{-# LANGUAGE BangPatterns #-}
{-# OPTIONS_GHC -fno-warn-unused-matches #-}
{-# OPTIONS_GHC -fno-warn-unused-binds #-}
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
{-# OPTIONS_GHC -fno-warn-tabs #-}
{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
@@ -84,7 +85,7 @@ import Control.Applicative
#endif
import Control.Monad
import Data.Bits
-import Data.Char hiding (ord)
+import Data.Char
import Data.List
import Data.Maybe
import Data.Word