[commit: ghc] master: Fix ./validate failure due to -Werror (4571b40)

git at git.haskell.org git at git.haskell.org
Tue Jan 14 09:47:30 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4571b4026248f5b1dc94a46d08b7f88164a5dce2/ghc

>---------------------------------------------------------------

commit 4571b4026248f5b1dc94a46d08b7f88164a5dce2
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon Jan 13 19:15:51 2014 -0600

    Fix ./validate failure due to -Werror
    
    This occurs when doing bootstraps with the 7.7 compiler.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

4571b4026248f5b1dc94a46d08b7f88164a5dce2
 compiler/specialise/SpecConstr.lhs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs
index 056044a..6332c6b 100644
--- a/compiler/specialise/SpecConstr.lhs
+++ b/compiler/specialise/SpecConstr.lhs
@@ -31,7 +31,7 @@ import DataCon
 import Coercion         hiding( substTy, substCo )
 import Rules
 import Type             hiding ( substTy )
-import TyCon            ( isRecursiveTyCon )
+import TyCon            ( isRecursiveTyCon, tyConName )
 import Id
 import MkCore           ( mkImpossibleExpr )
 import Var
@@ -53,11 +53,11 @@ import UniqFM
 import MonadUtils
 import Control.Monad    ( zipWithM )
 import Data.List
-import TyCon            ( TyCon, tyConName )
 import PrelNames        ( specTyConName )
 
 -- See Note [Forcing specialisation]
 #ifndef GHCI
+import TyCon ( TyCon )
 type SpecConstrAnnotation = ()
 #else
 import GHC.Exts( SpecConstrAnnotation(..) )



More information about the ghc-commits mailing list