hir: remove NodeId from Item
This commit is contained in:
ljedrz
parent
3c25193f3f
commit
77fa041fc1
42 changed files with 208 additions and 212 deletions
|
|
@ -1725,7 +1725,7 @@ impl Clean<Item> for doctree::Function {
|
|||
(self.generics.clean(cx), (&self.decl, self.body).clean(cx))
|
||||
});
|
||||
|
||||
let did = cx.tcx.hir().local_def_id(self.id);
|
||||
let did = cx.tcx.hir().local_def_id_from_hir_id(self.id);
|
||||
let constness = if cx.tcx.is_min_const_fn(did) {
|
||||
hir::Constness::Const
|
||||
} else {
|
||||
|
|
@ -1932,7 +1932,7 @@ impl Clean<Item> for doctree::Trait {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: attrs,
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -1962,7 +1962,7 @@ impl Clean<Item> for doctree::TraitAlias {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs,
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -2994,7 +2994,7 @@ impl Clean<Item> for doctree::Struct {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3014,7 +3014,7 @@ impl Clean<Item> for doctree::Union {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3061,7 +3061,7 @@ impl Clean<Item> for doctree::Enum {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3377,7 +3377,7 @@ impl Clean<Item> for doctree::Typedef {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id.clone()),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3401,7 +3401,7 @@ impl Clean<Item> for doctree::Existential {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id.clone()),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3452,7 +3452,7 @@ impl Clean<Item> for doctree::Static {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3477,7 +3477,7 @@ impl Clean<Item> for doctree::Constant {
|
|||
name: Some(self.name.clean(cx)),
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -3591,7 +3591,7 @@ impl Clean<Vec<Item>> for doctree::Impl {
|
|||
name: None,
|
||||
attrs: self.attrs.clean(cx),
|
||||
source: self.whence.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
visibility: self.vis.clean(cx),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
|
|
@ -4038,7 +4038,7 @@ impl Clean<Item> for doctree::ProcMacro {
|
|||
visibility: Some(Public),
|
||||
stability: self.stab.clean(cx),
|
||||
deprecation: self.depr.clean(cx),
|
||||
def_id: cx.tcx.hir().local_def_id(self.id),
|
||||
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.id),
|
||||
inner: ProcMacroItem(ProcMacro {
|
||||
kind: self.kind,
|
||||
helpers: self.helpers.clean(cx),
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ pub struct Struct {
|
|||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
pub depr: Option<attr::Deprecation>,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub struct_type: StructType,
|
||||
pub name: Name,
|
||||
pub generics: hir::Generics,
|
||||
|
|
@ -102,7 +102,7 @@ pub struct Union {
|
|||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
pub depr: Option<attr::Deprecation>,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub struct_type: StructType,
|
||||
pub name: Name,
|
||||
pub generics: hir::Generics,
|
||||
|
|
@ -118,7 +118,7 @@ pub struct Enum {
|
|||
pub variants: hir::HirVec<Variant>,
|
||||
pub generics: hir::Generics,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub whence: Span,
|
||||
pub name: Name,
|
||||
}
|
||||
|
|
@ -135,7 +135,7 @@ pub struct Variant {
|
|||
pub struct Function {
|
||||
pub decl: hir::FnDecl,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub name: Name,
|
||||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
|
|
@ -150,7 +150,7 @@ pub struct Typedef {
|
|||
pub ty: P<hir::Ty>,
|
||||
pub gen: hir::Generics,
|
||||
pub name: Name,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub whence: Span,
|
||||
pub vis: hir::Visibility,
|
||||
|
|
@ -161,7 +161,7 @@ pub struct Typedef {
|
|||
pub struct Existential {
|
||||
pub exist_ty: hir::ExistTy,
|
||||
pub name: Name,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub whence: Span,
|
||||
pub vis: hir::Visibility,
|
||||
|
|
@ -179,7 +179,7 @@ pub struct Static {
|
|||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
pub depr: Option<attr::Deprecation>,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub whence: Span,
|
||||
}
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ pub struct Constant {
|
|||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
pub depr: Option<attr::Deprecation>,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub whence: Span,
|
||||
}
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ pub struct Trait {
|
|||
pub generics: hir::Generics,
|
||||
pub bounds: hir::HirVec<hir::GenericBound>,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub whence: Span,
|
||||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
|
|
@ -215,7 +215,7 @@ pub struct TraitAlias {
|
|||
pub generics: hir::Generics,
|
||||
pub bounds: hir::HirVec<hir::GenericBound>,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub whence: Span,
|
||||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
|
|
@ -236,7 +236,7 @@ pub struct Impl {
|
|||
pub vis: hir::Visibility,
|
||||
pub stab: Option<attr::Stability>,
|
||||
pub depr: Option<attr::Deprecation>,
|
||||
pub id: ast::NodeId,
|
||||
pub id: hir::HirId,
|
||||
}
|
||||
|
||||
// For Macro we store the DefId instead of the NodeId, since we also create
|
||||
|
|
@ -263,7 +263,7 @@ pub struct ExternCrate {
|
|||
|
||||
pub struct Import {
|
||||
pub name: Name,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub vis: hir::Visibility,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
pub path: hir::Path,
|
||||
|
|
@ -273,7 +273,7 @@ pub struct Import {
|
|||
|
||||
pub struct ProcMacro {
|
||||
pub name: Name,
|
||||
pub id: NodeId,
|
||||
pub id: hir::HirId,
|
||||
pub kind: MacroKind,
|
||||
pub helpers: Vec<Name>,
|
||||
pub attrs: hir::HirVec<ast::Attribute>,
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
debug!("Visiting struct");
|
||||
let struct_type = struct_type_from_def(&*sd);
|
||||
Struct {
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
struct_type,
|
||||
name,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -120,7 +120,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
debug!("Visiting union");
|
||||
let struct_type = struct_type_from_def(&*sd);
|
||||
Union {
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
struct_type,
|
||||
name,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -152,7 +152,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
depr: self.deprecation(it.hir_id),
|
||||
generics: params.clone(),
|
||||
attrs: it.attrs.clone(),
|
||||
id: it.id,
|
||||
id: it.hir_id,
|
||||
whence: it.span,
|
||||
}
|
||||
}
|
||||
|
|
@ -202,7 +202,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
|
||||
om.proc_macros.push(ProcMacro {
|
||||
name,
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
kind,
|
||||
helpers,
|
||||
attrs: item.attrs.clone(),
|
||||
|
|
@ -213,7 +213,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
}
|
||||
None => {
|
||||
om.fns.push(Function {
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
vis: item.vis.clone(),
|
||||
stab: self.stability(item.hir_id),
|
||||
depr: self.deprecation(item.hir_id),
|
||||
|
|
@ -262,7 +262,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
///
|
||||
/// Returns `true` if the target has been inlined.
|
||||
fn maybe_inline_local(&mut self,
|
||||
id: ast::NodeId,
|
||||
id: hir::HirId,
|
||||
def: Def,
|
||||
renamed: Option<ast::Ident>,
|
||||
glob: bool,
|
||||
|
|
@ -291,7 +291,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
return false;
|
||||
};
|
||||
|
||||
let use_attrs = tcx.hir().attrs(id);
|
||||
let use_attrs = tcx.hir().attrs_by_hir_id(id);
|
||||
// Don't inline `doc(hidden)` imports so they can be stripped at a later stage.
|
||||
let is_no_inline = use_attrs.lists("doc").has_word("no_inline") ||
|
||||
use_attrs.lists("doc").has_word("hidden");
|
||||
|
|
@ -381,7 +381,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
let ident = renamed.unwrap_or(item.ident);
|
||||
|
||||
if item.vis.node.is_pub() {
|
||||
let def_id = self.cx.tcx.hir().local_def_id(item.id);
|
||||
let def_id = self.cx.tcx.hir().local_def_id_from_hir_id(item.hir_id);
|
||||
self.store_path(def_id);
|
||||
}
|
||||
|
||||
|
|
@ -401,7 +401,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
_ if self.inlining && !item.vis.node.is_pub() => {}
|
||||
hir::ItemKind::GlobalAsm(..) => {}
|
||||
hir::ItemKind::ExternCrate(orig_name) => {
|
||||
let def_id = self.cx.tcx.hir().local_def_id(item.id);
|
||||
let def_id = self.cx.tcx.hir().local_def_id_from_hir_id(item.hir_id);
|
||||
om.extern_crates.push(ExternCrate {
|
||||
cnum: self.cx.tcx.extern_mod_stmt_cnum(def_id)
|
||||
.unwrap_or(LOCAL_CRATE),
|
||||
|
|
@ -436,7 +436,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
}
|
||||
});
|
||||
let ident = if is_glob { None } else { Some(ident) };
|
||||
if self.maybe_inline_local(item.id,
|
||||
if self.maybe_inline_local(item.hir_id,
|
||||
path.def,
|
||||
ident,
|
||||
is_glob,
|
||||
|
|
@ -448,7 +448,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
|
||||
om.imports.push(Import {
|
||||
name: ident.name,
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
vis: item.vis.clone(),
|
||||
attrs: item.attrs.clone(),
|
||||
path: (**path).clone(),
|
||||
|
|
@ -477,7 +477,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
ty: ty.clone(),
|
||||
gen: gen.clone(),
|
||||
name: ident.name,
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -490,7 +490,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
let t = Existential {
|
||||
exist_ty: exist_ty.clone(),
|
||||
name: ident.name,
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -504,7 +504,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
type_: ty.clone(),
|
||||
mutability: mut_.clone(),
|
||||
expr: exp.clone(),
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
name: ident.name,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
|
|
@ -518,7 +518,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
let s = Constant {
|
||||
type_: ty.clone(),
|
||||
expr: exp.clone(),
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
name: ident.name,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
|
|
@ -539,7 +539,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
items,
|
||||
generics: gen.clone(),
|
||||
bounds: b.iter().cloned().collect(),
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -553,7 +553,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
name: ident.name,
|
||||
generics: gen.clone(),
|
||||
bounds: b.iter().cloned().collect(),
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
attrs: item.attrs.clone(),
|
||||
whence: item.span,
|
||||
vis: item.vis.clone(),
|
||||
|
|
@ -585,7 +585,7 @@ impl<'a, 'tcx, 'rcx> RustdocVisitor<'a, 'tcx, 'rcx> {
|
|||
for_: ty.clone(),
|
||||
items,
|
||||
attrs: item.attrs.clone(),
|
||||
id: item.id,
|
||||
id: item.hir_id,
|
||||
whence: item.span,
|
||||
vis: item.vis.clone(),
|
||||
stab: self.stability(item.hir_id),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue