Skip to content
Permalink
Browse files

Rename `ForeignItem.node` to `ForeignItem.kind`

  • Loading branch information...
varkor committed Sep 26, 2019
1 parent 7bc94cc commit b4748679611c97c09cfb7096917d7830c410a4ad
Showing with 52 additions and 52 deletions.
  1. +1 −1 src/librustc/hir/intravisit.rs
  2. +1 −1 src/librustc/hir/lowering/item.rs
  3. +1 −1 src/librustc/hir/map/def_collector.rs
  4. +2 −2 src/librustc/hir/map/mod.rs
  5. +1 −1 src/librustc/hir/mod.rs
  6. +1 −1 src/librustc/hir/print.rs
  7. +1 −1 src/librustc/middle/dead.rs
  8. +1 −1 src/librustc/middle/resolve_lifetime.rs
  9. +1 −1 src/librustc/middle/stability.rs
  10. +1 −1 src/librustc_codegen_llvm/consts.rs
  11. +1 −1 src/librustc_lint/types.rs
  12. +2 −2 src/librustc_metadata/encoder.rs
  13. +1 −1 src/librustc_passes/ast_validation.rs
  14. +2 −2 src/librustc_resolve/build_reduced_graph.rs
  15. +1 −1 src/librustc_resolve/late.rs
  16. +1 −1 src/librustc_save_analysis/dump_visitor.rs
  17. +1 −1 src/librustc_save_analysis/lib.rs
  18. +1 −1 src/librustc_save_analysis/sig.rs
  19. +1 −1 src/librustc_traits/lowering/environment.rs
  20. +2 −2 src/librustc_typeck/check/intrinsic.rs
  21. +2 −2 src/librustc_typeck/check/mod.rs
  22. +1 −1 src/librustc_typeck/check/wfcheck.rs
  23. +8 −8 src/librustc_typeck/collect.rs
  24. +1 −1 src/librustc_typeck/variance/constraints.rs
  25. +1 −1 src/librustc_typeck/variance/mod.rs
  26. +1 −1 src/librustc_typeck/variance/terms.rs
  27. +1 −1 src/librustdoc/visit_ast.rs
  28. +1 −1 src/libsyntax/ast.rs
  29. +1 −1 src/libsyntax/ext/expand.rs
  30. +2 −2 src/libsyntax/ext/placeholders.rs
  31. +1 −1 src/libsyntax/feature_gate/check.rs
  32. +2 −2 src/libsyntax/mut_visit.rs
  33. +4 −4 src/libsyntax/parse/parser/item.rs
  34. +1 −1 src/libsyntax/print/pprust.rs
  35. +1 −1 src/libsyntax/visit.rs
@@ -743,7 +743,7 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, foreign_item: &'v
visitor.visit_vis(&foreign_item.vis);
visitor.visit_ident(foreign_item.ident);

match foreign_item.node {
match foreign_item.kind {
ForeignItemKind::Fn(ref function_declaration, ref param_names, ref generics) => {
visitor.visit_generics(generics);
visitor.visit_fn_decl(function_declaration);
@@ -711,7 +711,7 @@ impl LoweringContext<'_> {
hir_id: self.lower_node_id(i.id),
ident: i.ident,
attrs: self.lower_attrs(&i.attrs),
node: match i.node {
kind: match i.kind {
ForeignItemKind::Fn(ref fdec, ref generics) => {
let (generics, (fn_dec, fn_args)) = self.add_in_band_defs(
generics,
@@ -157,7 +157,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
}

fn visit_foreign_item(&mut self, foreign_item: &'a ForeignItem) {
if let ForeignItemKind::Macro(_) = foreign_item.node {
if let ForeignItemKind::Macro(_) = foreign_item.kind {
return self.visit_macro_invoc(foreign_item.id);
}

@@ -313,7 +313,7 @@ impl<'hir> Map<'hir> {
}
}
Node::ForeignItem(item) => {
match item.node {
match item.kind {
ForeignItemKind::Fn(..) => DefKind::Fn,
ForeignItemKind::Static(..) => DefKind::Static,
ForeignItemKind::Type => DefKind::ForeignTy,
@@ -820,7 +820,7 @@ impl<'hir> Map<'hir> {
}
},
Node::ForeignItem(fi) => {
match fi.node {
match fi.kind {
ForeignItemKind::Fn(..) => true,
_ => false,
}
@@ -2581,7 +2581,7 @@ pub struct ForeignItem {
#[stable_hasher(project(name))]
pub ident: Ident,
pub attrs: HirVec<Attribute>,
pub node: ForeignItemKind,
pub kind: ForeignItemKind,
pub hir_id: HirId,
pub span: Span,
pub vis: Visibility,
@@ -372,7 +372,7 @@ impl<'a> State<'a> {
self.hardbreak_if_not_bol();
self.maybe_print_comment(item.span.lo());
self.print_outer_attributes(&item.attrs);
match item.node {
match item.kind {
hir::ForeignItemKind::Fn(ref decl, ref arg_names, ref generics) => {
self.head("");
self.print_fn(decl,
@@ -613,7 +613,7 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
fn visit_foreign_item(&mut self, fi: &'tcx hir::ForeignItem) {
if self.should_warn_about_foreign_item(fi) {
self.warn_dead_code(fi.hir_id, fi.span, fi.ident.name,
fi.node.descriptive_variant(), "used");
fi.kind.descriptive_variant(), "used");
}
intravisit::walk_foreign_item(self, fi);
}
@@ -541,7 +541,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
}

fn visit_foreign_item(&mut self, item: &'tcx hir::ForeignItem) {
match item.node {
match item.kind {
hir::ForeignItemKind::Fn(ref decl, _, ref generics) => {
self.visit_early_late(None, decl, generics, |this| {
intravisit::walk_foreign_item(this, item);
@@ -382,7 +382,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'a, 'tcx> {
}

fn visit_foreign_item(&mut self, i: &'tcx hir::ForeignItem) {
self.check_missing_stability(i.hir_id, i.span, i.node.descriptive_variant());
self.check_missing_stability(i.hir_id, i.span, i.kind.descriptive_variant());
intravisit::walk_foreign_item(self, i);
}

@@ -249,7 +249,7 @@ impl CodegenCx<'ll, 'tcx> {
}

Node::ForeignItem(&hir::ForeignItem {
ref attrs, span, node: hir::ForeignItemKind::Static(..), ..
ref attrs, span, kind: hir::ForeignItemKind::Static(..), ..
}) => {
let fn_attrs = self.tcx.codegen_fn_attrs(def_id);
(check_and_apply_linkage(&self, &fn_attrs, ty, sym, span), attrs)
@@ -978,7 +978,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImproperCTypes {
if let Abi::Rust | Abi::RustCall | Abi::RustIntrinsic | Abi::PlatformIntrinsic = abi {
// Don't worry about types in internal ABIs.
} else {
match it.node {
match it.kind {
hir::ForeignItemKind::Fn(ref decl, _, _) => {
vis.check_foreign_fn(it.hir_id, decl);
}
@@ -1677,7 +1677,7 @@ impl EncodeContext<'tcx> {

debug!("EncodeContext::encode_info_for_foreign_item({:?})", def_id);

let kind = match nitem.node {
let kind = match nitem.kind {
hir::ForeignItemKind::Fn(_, ref names, _) => {
let data = FnData {
asyncness: hir::IsAsync::NotAsync,
@@ -1703,7 +1703,7 @@ impl EncodeContext<'tcx> {

ty: Some(self.encode_item_type(def_id)),
inherent_impls: Lazy::empty(),
variances: match nitem.node {
variances: match nitem.kind {
hir::ForeignItemKind::Fn(..) => self.encode_variances_of(def_id),
_ => Lazy::empty(),
},
@@ -682,7 +682,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
}

fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
match fi.node {
match fi.kind {
ForeignItemKind::Fn(ref decl, _) => {
self.check_fn_decl(decl);
self.check_decl_no_pat(decl, |span, _| {
@@ -813,7 +813,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {

/// Constructs the reduced graph for one foreign item.
fn build_reduced_graph_for_foreign_item(&mut self, item: &ForeignItem) {
let (res, ns) = match item.node {
let (res, ns) = match item.kind {
ForeignItemKind::Fn(..) => {
(Res::Def(DefKind::Fn, self.r.definitions.local_def_id(item.id)), ValueNS)
}
@@ -1169,7 +1169,7 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
}

fn visit_foreign_item(&mut self, foreign_item: &'b ForeignItem) {
if let ForeignItemKind::Macro(_) = foreign_item.node {
if let ForeignItemKind::Macro(_) = foreign_item.kind {
self.visit_invoc(foreign_item.id);
return;
}
@@ -406,7 +406,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LateResolutionVisitor<'a, '_> {
visit::walk_poly_trait_ref(self, tref, m);
}
fn visit_foreign_item(&mut self, foreign_item: &'tcx ForeignItem) {
let generic_params = match foreign_item.node {
let generic_params = match foreign_item.kind {
ForeignItemKind::Fn(_, ref generics) => {
HasGenericParams(generics, ItemRibKind)
}
@@ -1570,7 +1570,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
let hir_id = self.tcx.hir().node_to_hir_id(item.id);
let access = access_from!(self.save_ctxt, item, hir_id);

match item.node {
match item.kind {
ast::ForeignItemKind::Fn(ref decl, ref generics) => {
if let Some(fn_data) = self.save_ctxt.get_extern_item_data(item) {
down_cast_data!(fn_data, DefData, item.span);
@@ -130,7 +130,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
pub fn get_extern_item_data(&self, item: &ast::ForeignItem) -> Option<Data> {
let qualname = format!("::{}",
self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id)));
match item.node {
match item.kind {
ast::ForeignItemKind::Fn(ref decl, ref generics) => {
filter!(self.span_utils, item.ident.span);

@@ -765,7 +765,7 @@ impl Sig for ast::Variant {
impl Sig for ast::ForeignItem {
fn make(&self, offset: usize, _parent_id: Option<NodeId>, scx: &SaveContext<'_, '_>) -> Result {
let id = Some(self.id);
match self.node {
match self.kind {
ast::ForeignItemKind::Fn(ref decl, ref generics) => {
let mut text = String::new();
text.push_str("fn ");
@@ -212,7 +212,7 @@ crate fn environment(tcx: TyCtxt<'_>, def_id: DefId) -> Environment<'_> {
_ => NodeKind::Other,
}

Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
ForeignItemKind::Fn(..) => NodeKind::Fn,
_ => NodeKind::Other,
}
@@ -24,7 +24,7 @@ fn equate_intrinsic_type<'tcx>(
) {
let def_id = tcx.hir().local_def_id(it.hir_id);

match it.node {
match it.kind {
hir::ForeignItemKind::Fn(..) => {}
_ => {
struct_span_err!(tcx.sess, it.span, E0622,
@@ -37,7 +37,7 @@ fn equate_intrinsic_type<'tcx>(

let i_n_tps = tcx.generics_of(def_id).own_counts().types;
if i_n_tps != n_tps {
let span = match it.node {
let span = match it.kind {
hir::ForeignItemKind::Fn(_, _, ref generics) => generics.span,
_ => bug!()
};
@@ -1588,7 +1588,7 @@ pub fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, it: &'tcx hir::Item) {
).emit();
}

if let hir::ForeignItemKind::Fn(ref fn_decl, _, _) = item.node {
if let hir::ForeignItemKind::Fn(ref fn_decl, _, _) = item.kind {
require_c_abi_if_c_variadic(tcx, fn_decl, m.abi, item.span);
}
}
@@ -4242,7 +4242,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
}
Some(Node::ForeignItem(hir::ForeignItem {
node: hir::ForeignItemKind::Fn(_, idents, _),
kind: hir::ForeignItemKind::Fn(_, idents, _),
..
})) |
Some(Node::TraitItem(hir::TraitItem {
@@ -128,7 +128,7 @@ pub fn check_item_well_formed(tcx: TyCtxt<'_>, def_id: DefId) {
check_item_type(tcx, item.hir_id, ty.span, false);
}
hir::ItemKind::ForeignMod(ref module) => for it in module.items.iter() {
if let hir::ForeignItemKind::Static(ref ty, ..) = it.node {
if let hir::ForeignItemKind::Static(ref ty, ..) = it.kind {
check_item_type(tcx, it.hir_id, ty.span, true);
}
},
@@ -312,7 +312,7 @@ fn type_param_predicates(
}
}

Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
ForeignItemKind::Fn(_, _, ref generics) => generics,
_ => return result,
},
@@ -415,7 +415,7 @@ fn convert_item(tcx: TyCtxt<'_>, item_id: hir::HirId) {
tcx.generics_of(def_id);
tcx.type_of(def_id);
tcx.predicates_of(def_id);
if let hir::ForeignItemKind::Fn(..) = item.node {
if let hir::ForeignItemKind::Fn(..) = item.kind {
tcx.fn_sig(def_id);
}
}
@@ -872,7 +872,7 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S
}
_ => None,
},
Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
hir::ForeignItemKind::Fn(ref fn_decl, _, ref generics) => {
has_late_bound_regions(tcx, generics, fn_decl)
}
@@ -977,7 +977,7 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
}
}

Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
ForeignItemKind::Static(..) => &no_generics,
ForeignItemKind::Fn(_, _, ref generics) => generics,
ForeignItemKind::Type => &no_generics,
@@ -1331,7 +1331,7 @@ pub fn checked_type_of(tcx: TyCtxt<'_>, def_id: DefId, fail: bool) -> Option<Ty<
}
}

Node::ForeignItem(foreign_item) => match foreign_item.node {
Node::ForeignItem(foreign_item) => match foreign_item.kind {
ForeignItemKind::Fn(..) => {
let substs = InternalSubsts::identity_for_item(tcx, def_id);
tcx.mk_fn_def(def_id, substs)
@@ -1823,7 +1823,7 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: DefId) -> ty::PolyFnSig<'_> {
},

ForeignItem(&hir::ForeignItem {
node: ForeignItemKind::Fn(ref fn_decl, _, _),
kind: ForeignItemKind::Fn(ref fn_decl, _, _),
..
}) => {
let abi = tcx.hir().get_foreign_abi(hir_id);
@@ -2133,7 +2133,7 @@ fn explicit_predicates_of(
}
}

Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
ForeignItemKind::Static(..) => NO_GENERICS,
ForeignItemKind::Fn(_, _, ref generics) => generics,
ForeignItemKind::Type => NO_GENERICS,
@@ -2420,7 +2420,7 @@ fn static_mutability(tcx: TyCtxt<'_>, def_id: DefId) -> Option<hir::Mutability>
kind: hir::ItemKind::Static(_, mutbl, _), ..
})) |
Some(Node::ForeignItem( &hir::ForeignItem {
node: hir::ForeignItemKind::Static(_, mutbl), ..
kind: hir::ForeignItemKind::Static(_, mutbl), ..
})) => Some(mutbl),
Some(_) => None,
_ => bug!("static_mutability applied to non-local def-id {:?}", def_id),
@@ -94,7 +94,7 @@ impl<'a, 'tcx, 'v> ItemLikeVisitor<'v> for ConstraintContext<'a, 'tcx> {

hir::ItemKind::ForeignMod(ref foreign_mod) => {
for foreign_item in &foreign_mod.items {
if let hir::ForeignItemKind::Fn(..) = foreign_item.node {
if let hir::ForeignItemKind::Fn(..) = foreign_item.kind {
self.visit_node_helper(foreign_item.hir_id);
}
}
@@ -70,7 +70,7 @@ fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {
_ => unsupported()
},

Node::ForeignItem(item) => match item.node {
Node::ForeignItem(item) => match item.kind {
hir::ForeignItemKind::Fn(..) => {}

_ => unsupported()
@@ -157,7 +157,7 @@ impl<'a, 'tcx, 'v> ItemLikeVisitor<'v> for TermsContext<'a, 'tcx> {

hir::ItemKind::ForeignMod(ref foreign_mod) => {
for foreign_item in &foreign_mod.items {
if let hir::ForeignItemKind::Fn(..) = foreign_item.node {
if let hir::ForeignItemKind::Fn(..) = foreign_item.kind {
self.add_inferreds_for_item(foreign_item.hir_id);
}
}
@@ -561,7 +561,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
om.foreigns.push(ForeignItem {
id: item.hir_id,
name: renamed.unwrap_or(item.ident).name,
kind: &item.node,
kind: &item.kind,
vis: &item.vis,
attrs: &item.attrs,
whence: item.span
@@ -2421,7 +2421,7 @@ impl ItemKind {
pub struct ForeignItem {
pub ident: Ident,
pub attrs: Vec<Attribute>,
pub node: ForeignItemKind,
pub kind: ForeignItemKind,
pub id: NodeId,
pub span: Span,
pub vis: Visibility,
@@ -1378,7 +1378,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
.make_foreign_items();
}

if let ast::ForeignItemKind::Macro(mac) = foreign_item.node {
if let ast::ForeignItemKind::Macro(mac) = foreign_item.kind {
self.check_attributes(&foreign_item.attrs);
return self.collect_bang(mac, foreign_item.span, AstFragmentKind::ForeignItems)
.make_foreign_items();
@@ -65,7 +65,7 @@ pub fn placeholder(kind: AstFragmentKind, id: ast::NodeId) -> AstFragment {
AstFragmentKind::ForeignItems =>
AstFragment::ForeignItems(smallvec![ast::ForeignItem {
id, span, ident, vis, attrs,
node: ast::ForeignItemKind::Macro(mac_placeholder()),
kind: ast::ForeignItemKind::Macro(mac_placeholder()),
}]),
AstFragmentKind::Pat => AstFragment::Pat(P(ast::Pat {
id, span, kind: ast::PatKind::Mac(mac_placeholder()),
@@ -275,7 +275,7 @@ impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
}

fn flat_map_foreign_item(&mut self, item: ast::ForeignItem) -> SmallVec<[ast::ForeignItem; 1]> {
match item.node {
match item.kind {
ast::ForeignItemKind::Macro(_) => self.remove(item.id).make_foreign_items(),
_ => noop_flat_map_foreign_item(item, self),
}
@@ -408,7 +408,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
}

fn visit_foreign_item(&mut self, i: &'a ast::ForeignItem) {
match i.node {
match i.kind {
ast::ForeignItemKind::Fn(..) |
ast::ForeignItemKind::Static(..) => {
let link_name = attr::first_attr_value_str_by_name(&i.attrs, sym::link_name);

0 comments on commit b474867

Please sign in to comment.
You can’t perform that action at this time.