---

yaml
---
r: 35231
b: refs/heads/master
c: ec0c029
h: refs/heads/master
i:
  35229: 0adf08c
  35227: 5738577
  35223: bdd4fdc
  35215: 09f25a0
  35199: e5801a3
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 236fd32f0a6647997a68dc729460a1030fdc74cb
+refs/heads/master: ec0c029a7ed9ac34bec716193e51b15d29965b0e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/metadata/csearch.rs

@@ -1,6 +1,7 @@
 // Searching for information from the cstore
 
 use std::ebml;
+use Reader = std::ebml::Reader;
 use syntax::ast;
 use syntax::ast_util;
 use syntax::ast_map;
@@ -181,7 +182,7 @@ fn get_field_type(tcx: ty::ctxt, class_id: ast::def_id,
                   def: ast::def_id) -> ty::ty_param_bounds_and_ty {
     let cstore = tcx.cstore;
     let cdata = cstore::get_crate_data(cstore, class_id.crate);
-    let all_items = ebml::get_doc(ebml::Doc(cdata.data), tag_items);
+    let all_items = Reader::get_doc(Reader::Doc(cdata.data), tag_items);
     debug!("Looking up %?", class_id);
     let class_doc = expect(tcx.diag,
                            decoder::maybe_find_item(class_id.node, all_items),