[commit: ghc] master: Minor typos (5ca623a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5ca623a5a06b96478efe0ac6e37bae4789c1d1c0/ghc

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

commit 5ca623a5a06b96478efe0ac6e37bae4789c1d1c0
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Thu May 24 10:37:35 2018 -0400

    Minor typos


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

5ca623a5a06b96478efe0ac6e37bae4789c1d1c0
 compiler/typecheck/TcDerivInfer.hs | 4 ++--
 compiler/typecheck/TcEnv.hs        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcDerivInfer.hs b/compiler/typecheck/TcDerivInfer.hs
index ec779c5..49578d9 100644
--- a/compiler/typecheck/TcDerivInfer.hs
+++ b/compiler/typecheck/TcDerivInfer.hs
@@ -746,8 +746,8 @@ simplifyDeriv pred tvs thetas
 Note [Overlap and deriving]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Consider some overlapping instances:
-  data Show a => Show [a] where ..
-  data Show [Char] where ...
+  instance Show a => Show [a] where ..
+  instance Show [Char] where ...
 
 Now a data type with deriving:
   data T a = MkT [a] deriving( Show )
diff --git a/compiler/typecheck/TcEnv.hs b/compiler/typecheck/TcEnv.hs
index 6a2f6ce..81ef54e 100644
--- a/compiler/typecheck/TcEnv.hs
+++ b/compiler/typecheck/TcEnv.hs
@@ -442,7 +442,7 @@ tcExtendKindEnvList :: [(Name, TcTyThing)] -> TcM r -> TcM r
 --      ATcTyCon or APromotionErr
 -- No need to update the global tyvars, or tcl_th_bndrs, or tcl_rdr
 tcExtendKindEnvList things thing_inside
-  = do { traceTc "txExtendKindEnvList" (ppr things)
+  = do { traceTc "tcExtendKindEnvList" (ppr things)
        ; updLclEnv upd_env thing_inside }
   where
     upd_env env = env { tcl_env = extendNameEnvList (tcl_env env) things }
@@ -450,7 +450,7 @@ tcExtendKindEnvList things thing_inside
 tcExtendKindEnv :: NameEnv TcTyThing -> TcM r -> TcM r
 -- A variant of tcExtendKindEvnList
 tcExtendKindEnv extra_env thing_inside
-  = do { traceTc "txExtendKindEnv" (ppr extra_env)
+  = do { traceTc "tcExtendKindEnv" (ppr extra_env)
        ; updLclEnv upd_env thing_inside }
   where
     upd_env env = env { tcl_env = tcl_env env `plusNameEnv` extra_env }