Merge branch 'master' into wip/binary-readerTwip/binary-readerT

4 files changed, 5 insertions, 5 deletions

diff --git a/compiler/iface/IfaceEnv.hs b/compiler/iface/IfaceEnv.hs
index 864c09ce2e..2bcfa82c96 100644
--- a/compiler/iface/IfaceEnv.hs
+++ b/compiler/iface/IfaceEnv.hs
@@ -87,7 +87,7 @@ allocateGlobalBinder name_supply mod occ loc
         -- of the Name, so we set this field in the Name we return.
         --
         -- Then (bogus) multiple bindings of the same Name
-        -- get different SrcLocs can can be reported as such.
+        -- get different SrcLocs can be reported as such.
         --
         -- Possible other reason: it might be in the cache because we
         --      encountered an occurrence before the binding site for an
diff --git a/compiler/iface/IfaceSyn.hs b/compiler/iface/IfaceSyn.hs
index 1482c689cb..82350195ee 100644
--- a/compiler/iface/IfaceSyn.hs
+++ b/compiler/iface/IfaceSyn.hs
@@ -67,7 +67,7 @@ import Binary
 import BooleanFormula ( BooleanFormula, pprBooleanFormula, isTrue )
 import Var( VarBndr(..), binderVar )
 import TyCon ( Role (..), Injectivity(..), tyConBndrVisArgFlag )
-import Util( dropList, filterByList, notNull, unzipWith )
+import Util( dropList, filterByList, notNull, unzipWith, debugIsOn )
 import DataCon (SrcStrictness(..), SrcUnpackedness(..))
 import Lexeme (isLexSym)
 import TysWiredIn ( constraintKindTyConName )
@@ -590,7 +590,7 @@ pprAxBranch pp_tc idx (IfaceAxBranch { ifaxbTyVars = tvs
                                      , ifaxbLHS = pat_tys
                                      , ifaxbRHS = rhs
                                      , ifaxbIncomps = incomps })
-  = WARN( not (null _cvs), pp_tc $$ ppr _cvs )
+  = ASSERT2( null _cvs, pp_tc $$ ppr _cvs )
     hang ppr_binders 2 (hang pp_lhs 2 (equals <+> ppr rhs))
     $+$
     nest 4 maybe_incomps
diff --git a/compiler/iface/IfaceType.hs b/compiler/iface/IfaceType.hs
index 44e8e7088a..8aba2418f3 100644
--- a/compiler/iface/IfaceType.hs
+++ b/compiler/iface/IfaceType.hs
@@ -881,7 +881,7 @@ ppr_ty ctxt_prec (IfaceCoercionTy co)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 RuntimeRep variables are considered by many (most?) users to be little
 more than syntactic noise. When the notion was introduced there was a
-signficant and understandable push-back from those with pedagogy in
+significant and understandable push-back from those with pedagogy in
 mind, which argued that RuntimeRep variables would throw a wrench into
 nearly any teach approach since they appear in even the lowly ($)
 function's type,
diff --git a/compiler/iface/LoadIface.hs b/compiler/iface/LoadIface.hs
index 2485f07df2..38f7524b8e 100644
--- a/compiler/iface/LoadIface.hs
+++ b/compiler/iface/LoadIface.hs
@@ -549,7 +549,7 @@ But there is a HORRIBLE HACK here.
 * And that means we end up loading M.hi-boot, because those
   data types are not yet in the type environment.
 
-But in this wierd case, /all/ we need is the types. We don't need
+But in this weird case, /all/ we need is the types. We don't need
 instances, rules etc.  And if we put the instances in the EPS
 we get "duplicate instance" warnings when we compile the "real"
 instance in M itself.  Hence the strange business of just updateing