[commit: ghc] master: Add a forward reference for a Note (512541b)

git at git.haskell.org git at git.haskell.org
Sat Oct 15 22:35:30 UTC 2016


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/512541bc6b1b81e1bda503754d02cf4dc4248dc4/ghc

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

commit 512541bc6b1b81e1bda503754d02cf4dc4248dc4
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Sat Oct 15 18:33:06 2016 -0400

    Add a forward reference for a Note
    
    And fix a typo within said Note.
    
    [ci skip]


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

512541bc6b1b81e1bda503754d02cf4dc4248dc4
 compiler/typecheck/TcRnMonad.hs | 2 +-
 compiler/typecheck/TcType.hs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcRnMonad.hs b/compiler/typecheck/TcRnMonad.hs
index 563e5aa..b871daf 100644
--- a/compiler/typecheck/TcRnMonad.hs
+++ b/compiler/typecheck/TcRnMonad.hs
@@ -1484,7 +1484,7 @@ pushTcLevelM_ :: TcM a -> TcM a
 pushTcLevelM_ x = updLclEnv (\ env -> env { tcl_tclvl = pushTcLevel (tcl_tclvl env) }) x
 
 pushTcLevelM :: TcM a -> TcM (a, TcLevel)
--- See Note [TcLevel assignment]
+-- See Note [TcLevel assignment] in TcType
 pushTcLevelM thing_inside
   = do { env <- getLclEnv
        ; let tclvl' = pushTcLevel (tcl_tclvl env)
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index e77a34d..1888578 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -654,7 +654,7 @@ We arrange the TcLevels like this
    ...etc...
 
 The even-numbered levels are for the flatten-meta-variables assigned
-at the next level in.  Eg for a second-level implication conststraint
+at the next level in.  Eg for a second-level implication constraint
 (level 5), the flatten meta-vars are level 4, which makes them untouchable.
 The flatten meta-vars could equally well all have level 0, or just NotALevel
 since they do not live across implications.



More information about the ghc-commits mailing list