Don't import FastString in HsVersions.h

[ghc-hetmet.git] / compiler / typecheck / TcDefaults.lhs

diff --git a/compiler/typecheck/TcDefaults.lhs b/compiler/typecheck/TcDefaults.lhs
index 43f23a3..ad5e9b8 100644 (file)
--- a/compiler/typecheck/TcDefaults.lhs
+++ b/compiler/typecheck/TcDefaults.lhs
@@ -29,6 +29,7 @@ import DynFlags
 import SrcLoc
 import Maybe
 import Outputable
+import FastString
 \end{code}
 
 \begin{code}
@@ -50,7 +51,7 @@ tcDefaults []
        -- defaultDefaultTys
 
 tcDefaults [L locn (DefaultDecl [])]
-  = returnM (Just [])          -- Default declaration specifying no types
+  = return (Just [])           -- Default declaration specifying no types
 
 tcDefaults [L locn (DefaultDecl mono_tys)]
   = setSrcSpan locn                    $
@@ -61,7 +62,7 @@ tcDefaults [L locn (DefaultDecl mono_tys)]
        ; let deflt_clss | ovl_str   = [num_class, is_str_class]
                         | otherwise = [num_class]
 
-       ; tau_tys <- mappM (tc_default_ty deflt_clss) mono_tys
+       ; tau_tys <- mapM (tc_default_ty deflt_clss) mono_tys
     
        ; return (Just tau_tys) }