---

yaml
---
r: 225899
b: refs/heads/stable
c: 957935a
h: refs/heads/master
i:
  225897: f0e4b2a
  225895: b343a31
v: v3

Author: nikomatsakis

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 13cee1e1987936514266861a4afa231d7224ad93
+refs/heads/stable: 957935a002aa88adb0f1288a84a0933d06cc297d
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/librustc/middle/ty.rs

@@ -755,7 +755,8 @@ pub struct ctxt<'tcx> {
 
     /// A set of predicates that have been fulfilled *somewhere*.
     /// This is used to avoid duplicate work. Predicates are only
-    /// added to this set when they
+    /// added to this set when they mention only "global" names
+    /// (i.e., no type or lifetime parameters).
     pub fulfilled_predicates: RefCell<traits::FulfilledPredicates<'tcx>>,
 
     /// Caches the representation hints for struct definitions.
@@ -823,7 +824,7 @@ bitflags! {
 
         // true if there are "names" of types and regions and so forth
         // that are local to a particular fn
-        const HAS_LOCAL_NAMES   = 1 << 8,
+        const HAS_LOCAL_NAMES   = 1 << 9,
 
         const NEEDS_SUBST        = TypeFlags::HAS_PARAMS.bits |
                                    TypeFlags::HAS_SELF.bits |