Skip to content

Commit 7cae549

Browse files
JohnTitorJohnTitor
authored
Rollup merge of rust-lang#69738 - mark-i-m:assoc-fn-2, r=Centril
More Method -> AssocFn renaming r? @Centril @eddyb cc rust-lang#60163 Blocked on rust-lang#69674
2 parents abbb9f4 + b9aef25 commit 7cae549

File tree

38 files changed

+104
-109
lines changed

38 files changed

+104
-109
lines changed

‎src/librustc/hir/map/blocks.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl MaybeFnLike for hir::Item<'_> {
5151
impl MaybeFnLike for hir::ImplItem<'_> {
5252
fn is_fn_like(&self) -> bool {
5353
match self.kind {
54-
hir::ImplItemKind::Method(..) => true,
54+
hir::ImplItemKind::Fn(..) => true,
5555
_ => false,
5656
}
5757
}
@@ -60,7 +60,7 @@ impl MaybeFnLike for hir::ImplItem<'_> {
6060
impl MaybeFnLike for hir::TraitItem<'_> {
6161
fn is_fn_like(&self) -> bool {
6262
match self.kind {
63-
hir::TraitItemKind::Fn(_, hir::TraitMethod::Provided(_)) => true,
63+
hir::TraitItemKind::Fn(_, hir::TraitFn::Provided(_)) => true,
6464
_ => false,
6565
}
6666
}
@@ -239,13 +239,13 @@ impl<'a> FnLikeNode<'a> {
239239
_ => bug!("item FnLikeNode that is not fn-like"),
240240
},
241241
Node::TraitItem(ti) => match ti.kind {
242-
hir::TraitItemKind::Fn(ref sig, hir::TraitMethod::Provided(body)) => {
242+
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(body)) => {
243243
method(ti.hir_id, ti.ident, sig, None, body, ti.span, &ti.attrs)
244244
}
245245
_ => bug!("trait method FnLikeNode that is not fn-like"),
246246
},
247247
Node::ImplItem(ii) => match ii.kind {
248-
hir::ImplItemKind::Method(ref sig, body) => {
248+
hir::ImplItemKind::Fn(ref sig, body) => {
249249
method(ii.hir_id, ii.ident, sig, Some(&ii.vis), body, ii.span, &ii.attrs)
250250
}
251251
_ => bug!("impl method FnLikeNode that is not fn-like"),

‎src/librustc/hir/map/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<'hir> Entry<'hir> {
5656
},
5757

5858
Node::ImplItem(ref item) => match item.kind {
59-
ImplItemKind::Method(ref sig, _) => Some(&sig.decl),
59+
ImplItemKind::Fn(ref sig, _) => Some(&sig.decl),
6060
_ => None,
6161
},
6262

@@ -82,7 +82,7 @@ impl<'hir> Entry<'hir> {
8282
},
8383

8484
Node::ImplItem(item) => match &item.kind {
85-
ImplItemKind::Method(sig, _) => Some(sig),
85+
ImplItemKind::Fn(sig, _) => Some(sig),
8686
_ => None,
8787
},
8888

@@ -101,12 +101,12 @@ impl<'hir> Entry<'hir> {
101101

102102
Node::TraitItem(item) => match item.kind {
103103
TraitItemKind::Const(_, Some(body))
104-
| TraitItemKind::Fn(_, TraitMethod::Provided(body)) => Some(body),
104+
| TraitItemKind::Fn(_, TraitFn::Provided(body)) => Some(body),
105105
_ => None,
106106
},
107107

108108
Node::ImplItem(item) => match item.kind {
109-
ImplItemKind::Const(_, body) | ImplItemKind::Method(_, body) => Some(body),
109+
ImplItemKind::Const(_, body) | ImplItemKind::Fn(_, body) => Some(body),
110110
_ => None,
111111
},
112112

@@ -331,7 +331,7 @@ impl<'hir> Map<'hir> {
331331
},
332332
Node::ImplItem(item) => match item.kind {
333333
ImplItemKind::Const(..) => DefKind::AssocConst,
334-
ImplItemKind::Method(..) => DefKind::AssocFn,
334+
ImplItemKind::Fn(..) => DefKind::AssocFn,
335335
ImplItemKind::TyAlias(..) => DefKind::AssocTy,
336336
ImplItemKind::OpaqueTy(..) => DefKind::AssocOpaqueTy,
337337
},
@@ -473,7 +473,7 @@ impl<'hir> Map<'hir> {
473473
Node::Ctor(..)
474474
| Node::Item(&Item { kind: ItemKind::Fn(..), .. })
475475
| Node::TraitItem(&TraitItem { kind: TraitItemKind::Fn(..), .. })
476-
| Node::ImplItem(&ImplItem { kind: ImplItemKind::Method(..), .. }) => BodyOwnerKind::Fn,
476+
| Node::ImplItem(&ImplItem { kind: ImplItemKind::Fn(..), .. }) => BodyOwnerKind::Fn,
477477
Node::Item(&Item { kind: ItemKind::Static(_, m, _), .. }) => BodyOwnerKind::Static(m),
478478
Node::Expr(&Expr { kind: ExprKind::Closure(..), .. }) => BodyOwnerKind::Closure,
479479
node => bug!("{:#?} is not a body node", node),
@@ -804,7 +804,7 @@ impl<'hir> Map<'hir> {
804804
_ => false,
805805
},
806806
Node::ImplItem(ii) => match ii.kind {
807-
ImplItemKind::Method(..) => true,
807+
ImplItemKind::Fn(..) => true,
808808
_ => false,
809809
},
810810
Node::Block(_) => true,
@@ -1300,7 +1300,7 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId, include_id: bool) -> String {
13001300
ImplItemKind::Const(..) => {
13011301
format!("assoc const {} in {}{}", ii.ident, path_str(), id_str)
13021302
}
1303-
ImplItemKind::Method(..) => format!("method {} in {}{}", ii.ident, path_str(), id_str),
1303+
ImplItemKind::Fn(..) => format!("method {} in {}{}", ii.ident, path_str(), id_str),
13041304
ImplItemKind::TyAlias(_) => {
13051305
format!("assoc type {} in {}{}", ii.ident, path_str(), id_str)
13061306
}

‎src/librustc_ast_lowering/item.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,13 +761,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
761761
let names = self.lower_fn_params_to_names(&sig.decl);
762762
let (generics, sig) =
763763
self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
764-
(generics, hir::TraitItemKind::Fn(sig, hir::TraitMethod::Required(names)))
764+
(generics, hir::TraitItemKind::Fn(sig, hir::TraitFn::Required(names)))
765765
}
766766
AssocItemKind::Fn(_, ref sig, ref generics, Some(ref body)) => {
767767
let body_id = self.lower_fn_body_block(i.span, &sig.decl, Some(body));
768768
let (generics, sig) =
769769
self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
770-
(generics, hir::TraitItemKind::Fn(sig, hir::TraitMethod::Provided(body_id)))
770+
(generics, hir::TraitItemKind::Fn(sig, hir::TraitFn::Provided(body_id)))
771771
}
772772
AssocItemKind::TyAlias(_, ref generics, ref bounds, ref default) => {
773773
let ty = default.as_ref().map(|x| self.lower_ty(x, ImplTraitContext::disallowed()));
@@ -838,7 +838,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
838838
asyncness.opt_return_id(),
839839
);
840840

841-
(generics, hir::ImplItemKind::Method(sig, body_id))
841+
(generics, hir::ImplItemKind::Fn(sig, body_id))
842842
}
843843
AssocItemKind::TyAlias(_, generics, _, ty) => {
844844
let generics = self.lower_generics(generics, ImplTraitContext::disallowed());

‎src/librustc_codegen_ssa/back/symbol_export.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fn reachable_non_generics_provider(
8888
// Only consider nodes that actually have exported symbols.
8989
Node::Item(&hir::Item { kind: hir::ItemKind::Static(..), .. })
9090
| Node::Item(&hir::Item { kind: hir::ItemKind::Fn(..), .. })
91-
| Node::ImplItem(&hir::ImplItem { kind: hir::ImplItemKind::Method(..), .. }) => {
91+
| Node::ImplItem(&hir::ImplItem { kind: hir::ImplItemKind::Fn(..), .. }) => {
9292
let def_id = tcx.hir().local_def_id(hir_id);
9393
let generics = tcx.generics_of(def_id);
9494
if !generics.requires_monomorphization(tcx) &&

‎src/librustc_hir/hir.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ pub struct TraitItem<'hir> {
18501850

18511851
/// Represents a trait method's body (or just argument names).
18521852
#[derive(RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
1853-
pub enum TraitMethod<'hir> {
1853+
pub enum TraitFn<'hir> {
18541854
/// No default body in the trait, just a signature.
18551855
Required(&'hir [Ident]),
18561856

@@ -1864,7 +1864,7 @@ pub enum TraitItemKind<'hir> {
18641864
/// An associated constant with an optional value (otherwise `impl`s must contain a value).
18651865
Const(&'hir Ty<'hir>, Option<BodyId>),
18661866
/// An associated function with an optional body.
1867-
Fn(FnSig<'hir>, TraitMethod<'hir>),
1867+
Fn(FnSig<'hir>, TraitFn<'hir>),
18681868
/// An associated type with (possibly empty) bounds and optional concrete
18691869
/// type.
18701870
Type(GenericBounds<'hir>, Option<&'hir Ty<'hir>>),
@@ -1897,8 +1897,8 @@ pub enum ImplItemKind<'hir> {
18971897
/// An associated constant of the given type, set to the constant result
18981898
/// of the expression.
18991899
Const(&'hir Ty<'hir>, BodyId),
1900-
/// A method implementation with the given signature and body.
1901-
Method(FnSig<'hir>, BodyId),
1900+
/// An associated function implementation with the given signature and body.
1901+
Fn(FnSig<'hir>, BodyId),
19021902
/// An associated type.
19031903
TyAlias(&'hir Ty<'hir>),
19041904
/// An associated `type = impl Trait`.
@@ -1909,7 +1909,7 @@ impl ImplItemKind<'_> {
19091909
pub fn namespace(&self) -> Namespace {
19101910
match self {
19111911
ImplItemKind::OpaqueTy(..) | ImplItemKind::TyAlias(..) => Namespace::TypeNS,
1912-
ImplItemKind::Const(..) | ImplItemKind::Method(..) => Namespace::ValueNS,
1912+
ImplItemKind::Const(..) | ImplItemKind::Fn(..) => Namespace::ValueNS,
19131913
}
19141914
}
19151915
}
@@ -2700,7 +2700,7 @@ impl Node<'_> {
27002700
pub fn fn_decl(&self) -> Option<&FnDecl<'_>> {
27012701
match self {
27022702
Node::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })
2703-
| Node::ImplItem(ImplItem { kind: ImplItemKind::Method(fn_sig, _), .. })
2703+
| Node::ImplItem(ImplItem { kind: ImplItemKind::Fn(fn_sig, _), .. })
27042704
| Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. }) => Some(fn_sig.decl),
27052705
Node::ForeignItem(ForeignItem { kind: ForeignItemKind::Fn(fn_decl, _, _), .. }) => {
27062706
Some(fn_decl)

‎src/librustc_hir/intravisit.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,14 +911,14 @@ pub fn walk_trait_item<'v, V: Visitor<'v>>(visitor: &mut V, trait_item: &'v Trai
911911
visitor.visit_ty(ty);
912912
walk_list!(visitor, visit_nested_body, default);
913913
}
914-
TraitItemKind::Fn(ref sig, TraitMethod::Required(param_names)) => {
914+
TraitItemKind::Fn(ref sig, TraitFn::Required(param_names)) => {
915915
visitor.visit_id(trait_item.hir_id);
916916
visitor.visit_fn_decl(&sig.decl);
917917
for &param_name in param_names {
918918
visitor.visit_ident(param_name);
919919
}
920920
}
921-
TraitItemKind::Fn(ref sig, TraitMethod::Provided(body_id)) => {
921+
TraitItemKind::Fn(ref sig, TraitFn::Provided(body_id)) => {
922922
visitor.visit_fn(
923923
FnKind::Method(trait_item.ident, sig, None, &trait_item.attrs),
924924
&sig.decl,
@@ -968,7 +968,7 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt
968968
visitor.visit_ty(ty);
969969
visitor.visit_nested_body(body);
970970
}
971-
ImplItemKind::Method(ref sig, body_id) => {
971+
ImplItemKind::Fn(ref sig, body_id) => {
972972
visitor.visit_fn(
973973
FnKind::Method(impl_item.ident, sig, Some(&impl_item.vis), &impl_item.attrs),
974974
&sig.decl,

‎src/librustc_hir/print.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -886,13 +886,13 @@ impl<'a> State<'a> {
886886
Spanned { span: rustc_span::DUMMY_SP, node: hir::VisibilityKind::Inherited };
887887
self.print_associated_const(ti.ident, &ty, default, &vis);
888888
}
889-
hir::TraitItemKind::Fn(ref sig, hir::TraitMethod::Required(ref arg_names)) => {
889+
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Required(ref arg_names)) => {
890890
let vis =
891891
Spanned { span: rustc_span::DUMMY_SP, node: hir::VisibilityKind::Inherited };
892892
self.print_method_sig(ti.ident, sig, &ti.generics, &vis, arg_names, None);
893893
self.s.word(";");
894894
}
895-
hir::TraitItemKind::Fn(ref sig, hir::TraitMethod::Provided(body)) => {
895+
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(body)) => {
896896
let vis =
897897
Spanned { span: rustc_span::DUMMY_SP, node: hir::VisibilityKind::Inherited };
898898
self.head("");
@@ -925,7 +925,7 @@ impl<'a> State<'a> {
925925
hir::ImplItemKind::Const(ref ty, expr) => {
926926
self.print_associated_const(ii.ident, &ty, Some(expr), &ii.vis);
927927
}
928-
hir::ImplItemKind::Method(ref sig, body) => {
928+
hir::ImplItemKind::Fn(ref sig, body) => {
929929
self.head("");
930930
self.print_method_sig(ii.ident, sig, &ii.generics, &ii.vis, &[], Some(body));
931931
self.nbsp();

‎src/librustc_hir/target.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ impl Target {
105105
pub fn from_trait_item(trait_item: &TraitItem<'_>) -> Target {
106106
match trait_item.kind {
107107
TraitItemKind::Const(..) => Target::AssocConst,
108-
TraitItemKind::Fn(_, hir::TraitMethod::Required(_)) => {
108+
TraitItemKind::Fn(_, hir::TraitFn::Required(_)) => {
109109
Target::Method(MethodKind::Trait { body: false })
110110
}
111-
TraitItemKind::Fn(_, hir::TraitMethod::Provided(_)) => {
111+
TraitItemKind::Fn(_, hir::TraitFn::Provided(_)) => {
112112
Target::Method(MethodKind::Trait { body: true })
113113
}
114114
TraitItemKind::Type(..) => Target::AssocTy,

‎src/librustc_incremental/persist/dirty_clean.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl DirtyCleanVisitor<'tcx> {
333333
TraitItemKind::Type(..) => ("NodeTraitType", LABELS_CONST_IN_TRAIT),
334334
},
335335
HirNode::ImplItem(item) => match item.kind {
336-
ImplItemKind::Method(..) => ("Node::ImplItem", LABELS_FN_IN_IMPL),
336+
ImplItemKind::Fn(..) => ("Node::ImplItem", LABELS_FN_IN_IMPL),
337337
ImplItemKind::Const(..) => ("NodeImplConst", LABELS_CONST_IN_IMPL),
338338
ImplItemKind::TyAlias(..) => ("NodeImplType", LABELS_CONST_IN_IMPL),
339339
ImplItemKind::OpaqueTy(..) => ("NodeImplType", LABELS_CONST_IN_IMPL),

‎src/librustc_infer/infer/error_reporting/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ fn trait_item_scope_tag(item: &hir::TraitItem<'_>) -> &'static str {
276276

277277
fn impl_item_scope_tag(item: &hir::ImplItem<'_>) -> &'static str {
278278
match item.kind {
279-
hir::ImplItemKind::Method(..) => "method body",
279+
hir::ImplItemKind::Fn(..) => "method body",
280280
hir::ImplItemKind::Const(..)
281281
| hir::ImplItemKind::OpaqueTy(..)
282282
| hir::ImplItemKind::TyAlias(..) => "associated item",

0 commit comments

Comments
 (0)