bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix merge errors

Browse source
This commit is contained in:
Niko Matsakis 2015-06-16 12:08:37 -04:00
parent 13cee1e198
commit 957935a002
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc/middle/ty.rs
View file

@ -755,7 +755,8 @@ pub struct ctxt<'tcx> {
/// A set of predicates that have been fulfilled *somewhere*. /// A set of predicates that have been fulfilled *somewhere*.
/// This is used to avoid duplicate work. Predicates are only /// 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>>, pub fulfilled_predicates: RefCell<traits::FulfilledPredicates<'tcx>>,
/// Caches the representation hints for struct definitions. /// Caches the representation hints for struct definitions.
@ -823,7 +824,7 @@ bitflags! {
// true if there are "names" of types and regions and so forth // true if there are "names" of types and regions and so forth
// that are local to a particular fn // 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 | const NEEDS_SUBST = TypeFlags::HAS_PARAMS.bits |
TypeFlags::HAS_SELF.bits | TypeFlags::HAS_SELF.bits |