bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unused attrs field from keywords

Browse source
This commit is contained in:
Joshua Nelson 2020-11-23 22:40:36 -05:00
parent e3e8087309
commit 51f00b08eb
3 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustdoc/clean/mod.rs
View file

@ -177,7 +177,7 @@ impl Clean<ExternalCrate> for CrateNum {
} }
} }
} }
return keyword.map(|p| (def_id, p, attrs)); return keyword.map(|p| (def_id, p));
} }
None None
}; };
@ -199,8 +199,8 @@ impl Clean<ExternalCrate> for CrateNum {
hir::ItemKind::Use(ref path, hir::UseKind::Single) hir::ItemKind::Use(ref path, hir::UseKind::Single)
if item.vis.node.is_pub() => if item.vis.node.is_pub() =>
{ {
as_keyword(path.res).map(|(_, prim, attrs)| { as_keyword(path.res).map(|(_, prim)| {
(cx.tcx.hir().local_def_id(id.id).to_def_id(), prim, attrs) (cx.tcx.hir().local_def_id(id.id).to_def_id(), prim)
}) })
} }
_ => None, _ => None,

11
src/librustdoc/clean/types.rs
View file

@ -33,8 +33,8 @@ use smallvec::{smallvec, SmallVec};
use crate::clean::cfg::Cfg; use crate::clean::cfg::Cfg;
use crate::clean::external_path; use crate::clean::external_path;
use crate::clean::inline; use crate::clean::inline;
use crate::clean::Clean;
use crate::clean::types::Type::{QPath, ResolvedPath}; use crate::clean::types::Type::{QPath, ResolvedPath};
use crate::clean::Clean;
use crate::core::DocContext; use crate::core::DocContext;
use crate::doctree; use crate::doctree;
use crate::formats::cache::cache; use crate::formats::cache::cache;
@ -69,7 +69,7 @@ crate struct ExternalCrate {
crate src: FileName, crate src: FileName,
crate attrs: Attributes, crate attrs: Attributes,
crate primitives: Vec<(DefId, PrimitiveType)>, crate primitives: Vec<(DefId, PrimitiveType)>,
crate keywords: Vec<(DefId, String, Attributes)>, crate keywords: Vec<(DefId, String)>,
} }
/// Anything with a source location and set of attributes and, optionally, a /// Anything with a source location and set of attributes and, optionally, a
@ -121,7 +121,12 @@ impl Item {
kind: ItemKind, kind: ItemKind,
cx: &DocContext<'_>, cx: &DocContext<'_>,
) -> Item { ) -> Item {
Item::from_def_id_and_parts(cx.tcx.hir().local_def_id(hir_id).to_def_id(), name.clean(cx), kind, cx) Item::from_def_id_and_parts(
cx.tcx.hir().local_def_id(hir_id).to_def_id(),
name.clean(cx),
kind,
cx,
)
} }
pub fn from_def_id_and_parts( pub fn from_def_id_and_parts(

23
src/librustdoc/clean/utils.rs
View file

@ -1,10 +1,10 @@
use crate::clean::auto_trait::AutoTraitFinder; use crate::clean::auto_trait::AutoTraitFinder;
use crate::clean::blanket_impl::BlanketImplFinder; use crate::clean::blanket_impl::BlanketImplFinder;
use crate::clean::{ use crate::clean::{
inline, Clean, Crate, ExternalCrate, FnDecl, FnRetTy, Generic, GenericArg, inline, Clean, Crate, ExternalCrate, FnDecl, FnRetTy, Generic, GenericArg, GenericArgs,
GenericArgs, GenericBound, Generics, GetDefId, ImportSource, Item, ItemKind, Lifetime, GenericBound, Generics, GetDefId, ImportSource, Item, ItemKind, Lifetime, MacroKind, Path,
MacroKind, Path, PathSegment, Primitive, PrimitiveType, ResolvedPath, Type, TypeBinding, PathSegment, Primitive, PrimitiveType, ResolvedPath, Type, TypeBinding, TypeKind,
TypeKind, WherePredicate, WherePredicate,
}; };
use crate::core::DocContext; use crate::core::DocContext;
@ -73,20 +73,9 @@ crate fn krate(mut cx: &mut DocContext<'_>) -> Crate {
cx, cx,
) )
})); }));
m.items.extend(keywords.into_iter() m.items.extend(keywords.into_iter().map(|(def_id, kw)| {
.map(|(def_id, kw, _)| Item::from_def_id_and_parts(def_id, Some(kw.clone()), ItemKind::KeywordItem(kw), cx) Item::from_def_id_and_parts(def_id, Some(kw.clone()), ItemKind::KeywordItem(kw), cx)
));
/*
source: Span::empty(),
name: Some(kw.clone()),
attrs,
visibility: Visibility::Public,
stability: get_stability(cx, def_id),
deprecation: get_deprecation(cx, def_id),
def_id,
kind: ItemKind::KeywordItem(kw),
})); }));
*/
} }
Crate { Crate {