Skip to content

Commit 89f9390

Browse files
committed
---
yaml --- r: 227561 b: refs/heads/try c: 957935a h: refs/heads/master i: 227559: 17598a4 v: v3
1 parent 1ebb8e2 commit 89f9390

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 13cee1e1987936514266861a4afa231d7224ad93
4+
refs/heads/try: 957935a002aa88adb0f1288a84a0933d06cc297d
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ pub struct ctxt<'tcx> {
755755

756756
/// A set of predicates that have been fulfilled *somewhere*.
757757
/// This is used to avoid duplicate work. Predicates are only
758-
/// added to this set when they
758+
/// added to this set when they mention only "global" names
759+
/// (i.e., no type or lifetime parameters).
759760
pub fulfilled_predicates: RefCell<traits::FulfilledPredicates<'tcx>>,
760761

761762
/// Caches the representation hints for struct definitions.
@@ -823,7 +824,7 @@ bitflags! {
823824

824825
// true if there are "names" of types and regions and so forth
825826
// that are local to a particular fn
826-
const HAS_LOCAL_NAMES = 1 << 8,
827+
const HAS_LOCAL_NAMES = 1 << 9,
827828

828829
const NEEDS_SUBST = TypeFlags::HAS_PARAMS.bits |
829830
TypeFlags::HAS_SELF.bits |

0 commit comments

Comments
 (0)