---

yaml
---
r: 40519
b: refs/heads/dist-snap
c: ec0c029
h: refs/heads/master
i:
  40517: 059f6d5
  40515: f3b4762
  40511: 9f5d114
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 236fd32f0a6647997a68dc729460a1030fdc74cb
+refs/heads/dist-snap: ec0c029a7ed9ac34bec716193e51b15d29965b0e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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),