diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-18 11:28:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 11:28:07 +0100 |
| commit | 5e8f934149772b781bb04e796be73446f63f99d2 (patch) | |
| tree | 9ff612ddbc6eeac84ac256cbcf92ccd5e088afb4 /src | |
| parent | a391d545cf91f975b6ed4cb65c217e66f46c1ea0 (diff) | |
| parent | 0d61852cc5e3c9c441e861acd31a1fc72f584c5b (diff) | |
Rollup merge of #92032 - petrochenkov:extblockpath, r=oli-obk
hir: Do not introduce dummy type names for `extern` blocks in def paths Use a separate nameless `DefPathData` variant instead. Extracted from https://github.com/rust-lang/rust/pull/91795.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/inline.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/visit_ast.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index 39544fa843d..57621f4f18c 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -8,6 +8,7 @@ use rustc_data_structures::fx::FxHashSet; use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::DefId; +use rustc_hir::definitions::DefPathData; use rustc_hir::Mutability; use rustc_metadata::creader::{CStore, LoadedMacro}; use rustc_middle::ty::{self, TyCtxt}; @@ -165,9 +166,8 @@ crate fn record_extern_fqn(cx: &mut DocContext<'_>, did: DefId, kind: ItemType) let crate_name = cx.tcx.crate_name(did.krate).to_string(); let relative = cx.tcx.def_path(did).data.into_iter().filter_map(|elem| { - // extern blocks have an empty name - let s = elem.data.to_string(); - if !s.is_empty() { Some(s) } else { None } + // Filter out extern blocks + (elem.data != DefPathData::ForeignMod).then(|| elem.data.to_string()) }); let fqn = if let ItemType::Macro = kind { // Check to see if it is a macro 2.0 or built-in macro diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index a18bd48d72b..ea7372761ba 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -5,6 +5,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::DefId; +use rustc_hir::definitions::DefPathData; use rustc_hir::Node; use rustc_hir::CRATE_HIR_ID; use rustc_middle::middle::privacy::AccessLevel; @@ -45,9 +46,8 @@ impl Module<'hir> { fn def_id_to_path(tcx: TyCtxt<'_>, did: DefId) -> Vec<String> { let crate_name = tcx.crate_name(did.krate).to_string(); let relative = tcx.def_path(did).data.into_iter().filter_map(|elem| { - // extern blocks have an empty name - let s = elem.data.to_string(); - if !s.is_empty() { Some(s) } else { None } + // Filter out extern blocks + (elem.data != DefPathData::ForeignMod).then(|| elem.data.to_string()) }); std::iter::once(crate_name).chain(relative).collect() } |
