[commit: ghc] master: Comments only. (2b3766b)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2b3766b59f58ad12e86b11ef0322ab0bcc490e52/ghc

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

commit 2b3766b59f58ad12e86b11ef0322ab0bcc490e52
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Apr 7 13:38:52 2015 -0700

    Comments only.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: comments only
    
    Reviewers: simonpj, austin, goldfire
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D820


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

2b3766b59f58ad12e86b11ef0322ab0bcc490e52
 compiler/typecheck/TcRnTypes.hs | 3 +++
 compiler/types/TypeRep.hs       | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 0cc0663..0d42334 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -796,6 +796,9 @@ data ArrowCtxt   -- Note [Escaping the arrow scope]
 -- TcTyThing
 ---------------------------
 
+-- | A typecheckable thing available in a local context.  Could be
+-- 'AGlobal' 'TyThing', but also lexically scoped variables, etc.
+-- See 'TcEnv' for how to retrieve a 'TyThing' given a 'Name'.
 data TcTyThing
   = AGlobal TyThing             -- Used only in the return type of a lookup
 
diff --git a/compiler/types/TypeRep.hs b/compiler/types/TypeRep.hs
index 8ed07c1..c91ddda 100644
--- a/compiler/types/TypeRep.hs
+++ b/compiler/types/TypeRep.hs
@@ -352,7 +352,10 @@ as ATyCon.  You can tell the difference, and get to the class, with
 The Class and its associated TyCon have the same Name.
 -}
 
--- | A typecheckable-thing, essentially anything that has a name
+-- | A global typecheckable-thing, essentially anything that has a name.
+-- Not to be confused with a 'TcTyThing', which is also a typecheckable
+-- thing but in the *local* context.  See 'TcEnv' for how to retrieve
+-- a 'TyThing' given a 'Name'.
 data TyThing
   = AnId     Id
   | AConLike ConLike