about summary refs log tree commit diff
path: root/src/librustdoc/formats
diff options
context:
space:
mode:
authorTimothée Delabrouille <timothee.delabrouille@musicworldmedia.com>2021-04-23 22:15:13 +0200
committerTimothée Delabrouille <timothee.delabrouille@musicworldmedia.com>2021-04-27 10:17:59 +0200
commitb4f1dfd2c57985a4cbb74fb34073ba04fd6f5f63 (patch)
tree574a6b0f39e26251ab3354f22d86575146726755 /src/librustdoc/formats
parent5da10c01214a3d3ebec65b8ba6effada92a0673f (diff)
downloadrust-b4f1dfd2c57985a4cbb74fb34073ba04fd6f5f63.tar.gz
rust-b4f1dfd2c57985a4cbb74fb34073ba04fd6f5f63.zip
Removed usage of Attributes in FnDecl and ExternalCrate. Relocate part of the fields in Attributes, as functions in AttributesExt.
refacto use from_def_id_and_attrs_and_parts instead of an old trick

most of josha suggestions + check if def_id is not fake before using it in a query

Removed usage of Attributes in FnDecl and ExternalCrate. Relocate part of the Attributes fields as functions in AttributesExt.
Diffstat (limited to 'src/librustdoc/formats')
-rw-r--r--src/librustdoc/formats/cache.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/librustdoc/formats/cache.rs b/src/librustdoc/formats/cache.rs
index 9a61f963a3e..8f8bca64e14 100644
--- a/src/librustdoc/formats/cache.rs
+++ b/src/librustdoc/formats/cache.rs
@@ -164,10 +164,12 @@ impl Cache {
             };
             let name = e.name(tcx);
             let extern_url = extern_html_root_urls.get(&*name.as_str()).map(|u| &**u);
-            self.extern_locations
-                .insert(n, (name, src_root, extern_location(e, extern_url, &dst, tcx)));
-
             let did = DefId { krate: n, index: CRATE_DEF_INDEX };
+            self.extern_locations.insert(
+                n,
+                (name, src_root, extern_location(e, extern_url, tcx.get_attrs(did), &dst, tcx)),
+            );
+
             self.external_paths.insert(did, (vec![name.to_string()], ItemType::Module));
         }