---

nikomatsakis · nikomatsakis · commit 4bde380563a3 · 2012-07-25T09:19:59.000-07:00
yaml --- r: 31390 b: refs/heads/dist-snap c: dc744e8 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: cc8086a045abf1aaac29c3d33b1a18a9ae67a58d
+refs/heads/dist-snap: dc744e816d2d215bee6b3a32230871d5efacc650
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/rustc/metadata/tydecode.rs b/branches/dist-snap/src/rustc/metadata/tydecode.rs
@@ -133,6 +133,11 @@ fn parse_bound_region(st: @pstate) -> ty::bound_region {
       's' { ty::br_self }
       'a' { ty::br_anon }
       '[' { ty::br_named(@parse_str(st, ']')) }
+      'c' {
+        let id = parse_int(st);
+        assert next(st) == '|';
+        ty::br_cap_avoid(id, @parse_bound_region(st))
+      }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,11 @@ fn parse_bound_region(st: @pstate) -> ty::bound_region {`
`133`	`133`	`'s' { ty::br_self }`
`134`	`134`	`'a' { ty::br_anon }`
`135`	`135`	`'[' { ty::br_named(@parse_str(st, ']')) }`
	`136`	`+ 'c' {`
	`137`	`+ let id = parse_int(st);`
	`138`	`+ assert next(st) == '\|';`
	`139`	`+ ty::br_cap_avoid(id, @parse_bound_region(st))`
	`140`	`+ }`
`136`	`141`	`}`
`137`	`142`	`}`
`138`	`143`