diff options
| author | varkor <github@varkor.com> | 2019-09-26 17:51:36 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2019-09-26 18:21:48 +0100 |
| commit | 7bc94cc3c2ccef8b4d393910bb978a6487db1202 (patch) | |
| tree | 1c7a5175d795992497651e7dfa3e3a0f76f5815a /src/librustc_save_analysis | |
| parent | 21bf983acbb5d7ac8fb9462cbf2cc4c280abd857 (diff) | |
| download | rust-7bc94cc3c2ccef8b4d393910bb978a6487db1202.tar.gz rust-7bc94cc3c2ccef8b4d393910bb978a6487db1202.zip | |
Rename `Item.node` to `Item.kind`
Diffstat (limited to 'src/librustc_save_analysis')
| -rw-r--r-- | src/librustc_save_analysis/dump_visitor.rs | 6 | ||||
| -rw-r--r-- | src/librustc_save_analysis/lib.rs | 6 | ||||
| -rw-r--r-- | src/librustc_save_analysis/sig.rs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index c24552678eb..d81d24e3a1b 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -472,13 +472,13 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> { let qualname = format!("::{}", self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))); - let kind = match item.node { + let kind = match item.kind { ast::ItemKind::Struct(_, _) => DefKind::Struct, ast::ItemKind::Union(_, _) => DefKind::Union, _ => unreachable!(), }; - let (value, fields) = match item.node { + let (value, fields) = match item.kind { ast::ItemKind::Struct(ast::VariantData::Struct(ref fields, ..), ..) | ast::ItemKind::Union(ast::VariantData::Struct(ref fields, ..), ..) => { let include_priv_fields = !self.save_ctxt.config.pub_only; @@ -1276,7 +1276,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> { fn visit_item(&mut self, item: &'l ast::Item) { use syntax::ast::ItemKind::*; self.process_macro_use(item.span); - match item.node { + match item.kind { Use(ref use_tree) => { let prefix = ast::Path { segments: vec![], diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index bc067ab6ba5..20cf7949fec 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -177,7 +177,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> { } pub fn get_item_data(&self, item: &ast::Item) -> Option<Data> { - match item.node { + match item.kind { ast::ItemKind::Fn(ref decl, .., ref generics, _) => { let qualname = format!("::{}", self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))); @@ -396,7 +396,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> { let (qualname, parent_scope, decl_id, docs, attributes) = match self.tcx.impl_of_method(self.tcx.hir().local_def_id_from_node_id(id)) { Some(impl_id) => match self.tcx.hir().get_if_local(impl_id) { - Some(Node::Item(item)) => match item.node { + Some(Node::Item(item)) => match item.kind { hir::ItemKind::Impl(.., ref ty, _) => { let mut qualname = String::from("<"); qualname.push_str(&self.tcx.hir().hir_to_pretty_string(ty.hir_id)); @@ -612,7 +612,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> { Node::TraitRef(tr) => tr.path.res, Node::Item(&hir::Item { - node: hir::ItemKind::Use(ref path, _), + kind: hir::ItemKind::Use(ref path, _), .. }) | Node::Visibility(&Spanned { diff --git a/src/librustc_save_analysis/sig.rs b/src/librustc_save_analysis/sig.rs index 87417f577a1..8a0c9069224 100644 --- a/src/librustc_save_analysis/sig.rs +++ b/src/librustc_save_analysis/sig.rs @@ -324,7 +324,7 @@ impl Sig for ast::Item { fn make(&self, offset: usize, _parent_id: Option<NodeId>, scx: &SaveContext<'_, '_>) -> Result { let id = Some(self.id); - match self.node { + match self.kind { ast::ItemKind::Static(ref ty, m, ref expr) => { let mut text = "static ".to_owned(); if m == ast::Mutability::Mutable { |
