diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-03-26 17:18:09 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-03-26 17:18:09 +0200 |
| commit | ebbe0c210c60fce57db4e0f5f2a805c9bfe41ac6 (patch) | |
| tree | 8a0f6b48b1e7a66dd9f667039888b2e6f68d4f16 | |
| parent | 184156ed97a0a1256e80a17b8673749569407c94 (diff) | |
| download | rust-ebbe0c210c60fce57db4e0f5f2a805c9bfe41ac6.tar.gz rust-ebbe0c210c60fce57db4e0f5f2a805c9bfe41ac6.zip | |
Fix path attribute in rustdoc
| -rw-r--r-- | src/librustc_metadata/cstore_impl.rs | 2 | ||||
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs index 5fd8ebaa9b4..56402121312 100644 --- a/src/librustc_metadata/cstore_impl.rs +++ b/src/librustc_metadata/cstore_impl.rs @@ -163,7 +163,7 @@ provide! { <'tcx> tcx, def_id, other, cdata, fn_arg_names => { cdata.get_fn_arg_names(def_id.index) } impl_parent => { cdata.get_parent_impl(def_id.index) } trait_of_item => { cdata.get_trait_of_item(def_id.index) } - item_body_nested_bodies => { cdata.item_body_nested_bodies(def_id.index) } + item_body_nested_bodies => { cdata.item_body_nested_bodies(tcx, def_id.index) } const_is_rvalue_promotable_to_static => { cdata.const_is_rvalue_promotable_to_static(def_id.index) } diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index e938d5c1a97..c238cb3062b 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -818,11 +818,14 @@ impl<'a, 'tcx> CrateMetadata { tcx.alloc_tables(ast.tables.decode((self, tcx))) } - pub fn item_body_nested_bodies(&self, id: DefIndex) -> ExternBodyNestedBodies { + pub fn item_body_nested_bodies(&self, + tcx: TyCtxt<'a, 'tcx, 'tcx>, + id: DefIndex) + -> ExternBodyNestedBodies { if let Some(ref ast) = self.entry(id).ast { - let ast = ast.decode(self); + let mut ast = ast.decode(self); let nested_bodies: BTreeMap<_, _> = ast.nested_bodies - .decode(self) + .decode((self, tcx.sess)) .map(|body| (body.id(), body)) .collect(); ExternBodyNestedBodies { |
