Remove dead tracking of external param names
This commit is contained in:
parent
57d57c6784
commit
95f5698c10
@ -566,23 +566,6 @@ pub enum ItemEnum {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ItemEnum {
|
impl ItemEnum {
|
||||||
pub fn generics(&self) -> Option<&Generics> {
|
|
||||||
Some(match *self {
|
|
||||||
ItemEnum::StructItem(ref s) => &s.generics,
|
|
||||||
ItemEnum::EnumItem(ref e) => &e.generics,
|
|
||||||
ItemEnum::FunctionItem(ref f) => &f.generics,
|
|
||||||
ItemEnum::TypedefItem(ref t, _) => &t.generics,
|
|
||||||
ItemEnum::OpaqueTyItem(ref t, _) => &t.generics,
|
|
||||||
ItemEnum::TraitItem(ref t) => &t.generics,
|
|
||||||
ItemEnum::ImplItem(ref i) => &i.generics,
|
|
||||||
ItemEnum::TyMethodItem(ref i) => &i.generics,
|
|
||||||
ItemEnum::MethodItem(ref i) => &i.generics,
|
|
||||||
ItemEnum::ForeignFunctionItem(ref f) => &f.generics,
|
|
||||||
ItemEnum::TraitAliasItem(ref ta) => &ta.generics,
|
|
||||||
_ => return None,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_associated(&self) -> bool {
|
pub fn is_associated(&self) -> bool {
|
||||||
match *self {
|
match *self {
|
||||||
ItemEnum::TypedefItem(_, _) |
|
ItemEnum::TypedefItem(_, _) |
|
||||||
@ -1535,8 +1518,6 @@ impl Clean<GenericParamDef> for ty::GenericParamDef {
|
|||||||
(self.name.to_string(), GenericParamDefKind::Lifetime)
|
(self.name.to_string(), GenericParamDefKind::Lifetime)
|
||||||
}
|
}
|
||||||
ty::GenericParamDefKind::Type { has_default, synthetic, .. } => {
|
ty::GenericParamDefKind::Type { has_default, synthetic, .. } => {
|
||||||
cx.renderinfo.borrow_mut().external_param_names
|
|
||||||
.insert(self.def_id, self.name.clean(cx));
|
|
||||||
let default = if has_default {
|
let default = if has_default {
|
||||||
Some(cx.tcx.type_of(self.def_id).clean(cx))
|
Some(cx.tcx.type_of(self.def_id).clean(cx))
|
||||||
} else {
|
} else {
|
||||||
|
@ -282,11 +282,6 @@ impl Impl {
|
|||||||
/// rendering threads.
|
/// rendering threads.
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct Cache {
|
pub struct Cache {
|
||||||
/// Mapping of typaram ids to the name of the type parameter. This is used
|
|
||||||
/// when pretty-printing a type (so pretty-printing doesn't have to
|
|
||||||
/// painfully maintain a context like this)
|
|
||||||
pub param_names: FxHashMap<DefId, String>,
|
|
||||||
|
|
||||||
/// Maps a type ID to all known implementations for that type. This is only
|
/// Maps a type ID to all known implementations for that type. This is only
|
||||||
/// recognized for intra-crate `ResolvedPath` types, and is used to print
|
/// recognized for intra-crate `ResolvedPath` types, and is used to print
|
||||||
/// out extra documentation on the page of an enum/struct.
|
/// out extra documentation on the page of an enum/struct.
|
||||||
@ -382,7 +377,6 @@ pub struct Cache {
|
|||||||
pub struct RenderInfo {
|
pub struct RenderInfo {
|
||||||
pub inlined: FxHashSet<DefId>,
|
pub inlined: FxHashSet<DefId>,
|
||||||
pub external_paths: crate::core::ExternalPaths,
|
pub external_paths: crate::core::ExternalPaths,
|
||||||
pub external_param_names: FxHashMap<DefId, String>,
|
|
||||||
pub exact_paths: FxHashMap<DefId, Vec<String>>,
|
pub exact_paths: FxHashMap<DefId, Vec<String>>,
|
||||||
pub access_levels: AccessLevels<DefId>,
|
pub access_levels: AccessLevels<DefId>,
|
||||||
pub deref_trait_did: Option<DefId>,
|
pub deref_trait_did: Option<DefId>,
|
||||||
@ -617,7 +611,6 @@ pub fn run(mut krate: clean::Crate,
|
|||||||
let RenderInfo {
|
let RenderInfo {
|
||||||
inlined: _,
|
inlined: _,
|
||||||
external_paths,
|
external_paths,
|
||||||
external_param_names,
|
|
||||||
exact_paths,
|
exact_paths,
|
||||||
access_levels,
|
access_levels,
|
||||||
deref_trait_did,
|
deref_trait_did,
|
||||||
@ -651,7 +644,6 @@ pub fn run(mut krate: clean::Crate,
|
|||||||
deref_mut_trait_did,
|
deref_mut_trait_did,
|
||||||
owned_box_did,
|
owned_box_did,
|
||||||
masked_crates: mem::take(&mut krate.masked_crates),
|
masked_crates: mem::take(&mut krate.masked_crates),
|
||||||
param_names: external_param_names,
|
|
||||||
aliases: Default::default(),
|
aliases: Default::default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1419,12 +1411,6 @@ impl DocFolder for Cache {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register any generics to their corresponding string. This is used
|
|
||||||
// when pretty-printing types.
|
|
||||||
if let Some(generics) = item.inner.generics() {
|
|
||||||
self.generics(generics);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Propagate a trait method's documentation to all implementors of the
|
// Propagate a trait method's documentation to all implementors of the
|
||||||
// trait.
|
// trait.
|
||||||
if let clean::TraitItem(ref t) = item.inner {
|
if let clean::TraitItem(ref t) = item.inner {
|
||||||
@ -1657,18 +1643,6 @@ impl DocFolder for Cache {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Cache {
|
impl Cache {
|
||||||
fn generics(&mut self, generics: &clean::Generics) {
|
|
||||||
for param in &generics.params {
|
|
||||||
match param.kind {
|
|
||||||
clean::GenericParamDefKind::Lifetime => {}
|
|
||||||
clean::GenericParamDefKind::Type { did, .. } |
|
|
||||||
clean::GenericParamDefKind::Const { did, .. } => {
|
|
||||||
self.param_names.insert(did, param.name.clone());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn add_aliases(&mut self, item: &clean::Item) {
|
fn add_aliases(&mut self, item: &clean::Item) {
|
||||||
if item.def_id.index == CRATE_DEF_INDEX {
|
if item.def_id.index == CRATE_DEF_INDEX {
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user