Skip to content

Commit d0f8307

Browse files
committed
---
yaml --- r: 58028 b: refs/heads/incoming c: b37a685 h: refs/heads/master v: v3
1 parent 9337309 commit d0f8307

File tree

22 files changed

+5471
-647
lines changed

22 files changed

+5471
-647
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: baa1c1834f608c8c789db6d2495626ff9d28dd96
9+
refs/heads/incoming: b37a685958a99ae37eef4e8bf7e8498ea7b698c1
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/metadata/decoder.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,21 @@ fn item_ty_param_defs(item: ebml::Doc, tcx: ty::ctxt, cdata: cmd,
272272
@bounds
273273
}
274274
275+
#[cfg(stage0)]
275276
fn item_ty_region_param(item: ebml::Doc) -> Option<ty::region_variance> {
276277
reader::maybe_get_doc(item, tag_region_param).map(|doc| {
277278
Decodable::decode(&reader::Decoder(*doc))
278279
})
279280
}
280281
282+
#[cfg(not(stage0))]
283+
fn item_ty_region_param(item: ebml::Doc) -> Option<ty::region_variance> {
284+
reader::maybe_get_doc(item, tag_region_param).map(|doc| {
285+
let mut decoder = reader::Decoder(*doc);
286+
Decodable::decode(&mut decoder)
287+
})
288+
}
289+
281290
fn item_ty_param_count(item: ebml::Doc) -> uint {
282291
let mut n = 0u;
283292
reader::tagged_docs(item, tag_items_data_item_ty_param_bounds,

0 commit comments

Comments
 (0)