Skip to content

Commit 52c0a5b

Browse files
committed
---
yaml --- r: 94622 b: refs/heads/try c: bdfd0b5 h: refs/heads/master v: v3
1 parent 1f7d99c commit 52c0a5b

File tree

2 files changed

+6
-6
lines changed
  • branches/try/src/librustc/middle/typeck/infer/region_inference

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: 0a0ce8d227ceedd53924ce0a9afbac8d5604e3cb
5+
refs/heads/try: bdfd0b5ae081240697fb087f59c42ab9ba070bef
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/infer/region_inference/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub struct RegionVarBindings {
9393
lubs: CombineMap,
9494
glbs: CombineMap,
9595
skolemization_count: Cell<uint>,
96-
bound_count: uint,
96+
bound_count: Cell<uint>,
9797

9898
// The undo log records actions that might later be undone.
9999
//
@@ -119,7 +119,7 @@ pub fn RegionVarBindings(tcx: ty::ctxt) -> RegionVarBindings {
119119
lubs: HashMap::new(),
120120
glbs: HashMap::new(),
121121
skolemization_count: Cell::new(0),
122-
bound_count: 0,
122+
bound_count: Cell::new(0),
123123
undo_log: ~[]
124124
}
125125
}
@@ -212,10 +212,10 @@ impl RegionVarBindings {
212212
// changing the representation of bound regions in a fn
213213
// declaration
214214

215-
let sc = self.bound_count;
216-
self.bound_count += 1;
215+
let sc = self.bound_count.get();
216+
self.bound_count.set(sc + 1);
217217

218-
if sc >= self.bound_count {
218+
if sc >= self.bound_count.get() {
219219
self.tcx.sess.bug("Rollover in RegionInference new_bound()");
220220
}
221221

0 commit comments

Comments
 (0)