diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-06-16 12:08:37 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-06-16 12:08:37 -0400 |
| commit | 957935a002aa88adb0f1288a84a0933d06cc297d (patch) | |
| tree | 8a6f51674819b96ef664dff5e0fe30d9e46a70ef | |
| parent | 13cee1e1987936514266861a4afa231d7224ad93 (diff) | |
| download | rust-957935a002aa88adb0f1288a84a0933d06cc297d.tar.gz rust-957935a002aa88adb0f1288a84a0933d06cc297d.zip | |
Fix merge errors
| -rw-r--r-- | src/librustc/middle/ty.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 62682e1a6fb..6662e3ef4b3 100644 --- a/src/librustc/middle/ty.rs +++ b/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 | |