Skip to content

Commit 63659ca

Browse files
varkorvarkor
committed
Rename ItemImplKind::Type to ItemImplKind::TyAlias 
1 parent 8aa45c6 commit 63659ca

File tree

28 files changed

+36
-35
lines changed

28 files changed

+36
-35
lines changed

‎src/librustc/hir/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ pub fn walk_impl_item<'v, V: Visitor<'v>>(visitor: &mut V, impl_item: &'v ImplIt
926926
impl_item.span,
927927
impl_item.hir_id);
928928
}
929-
ImplItemKind::Type(ref ty) => {
929+
ImplItemKind::TyAlias(ref ty) => {
930930
visitor.visit_id(impl_item.hir_id);
931931
visitor.visit_ty(ty);
932932
}

‎src/librustc/hir/lowering.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3914,9 +3914,9 @@ impl<'a> LoweringContext<'a> {
39143914

39153915
(generics, hir::ImplItemKind::Method(sig, body_id))
39163916
}
3917-
ImplItemKind::Type(ref ty) => (
3917+
ImplItemKind::TyAlias(ref ty) => (
39183918
self.lower_generics(&i.generics, ImplTraitContext::disallowed()),
3919-
hir::ImplItemKind::Type(self.lower_ty(ty, ImplTraitContext::disallowed())),
3919+
hir::ImplItemKind::TyAlias(self.lower_ty(ty, ImplTraitContext::disallowed())),
39203920
),
39213921
ImplItemKind::OpaqueTy(ref bounds) => (
39223922
self.lower_generics(&i.generics, ImplTraitContext::disallowed()),
@@ -3950,7 +3950,7 @@ impl<'a> LoweringContext<'a> {
39503950
defaultness: self.lower_defaultness(i.defaultness, true /* [1] */),
39513951
kind: match i.node {
39523952
ImplItemKind::Const(..) => hir::AssocItemKind::Const,
3953-
ImplItemKind::Type(..) => hir::AssocItemKind::Type,
3953+
ImplItemKind::TyAlias(..) => hir::AssocItemKind::Type,
39543954
ImplItemKind::OpaqueTy(..) => hir::AssocItemKind::OpaqueTy,
39553955
ImplItemKind::Method(ref sig, _) => hir::AssocItemKind::Method {
39563956
has_self: sig.decl.has_self(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
222222
}
223223
ImplItemKind::Method(..) | ImplItemKind::Const(..) =>
224224
DefPathData::ValueNs(ii.ident.as_interned_str()),
225-
ImplItemKind::Type(..) |
225+
ImplItemKind::TyAlias(..) |
226226
ImplItemKind::OpaqueTy(..) => {
227227
DefPathData::TypeNs(ii.ident.as_interned_str())
228228
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl<'hir> Map<'hir> {
333333
match item.node {
334334
ImplItemKind::Const(..) => DefKind::AssocConst,
335335
ImplItemKind::Method(..) => DefKind::Method,
336-
ImplItemKind::Type(..) => DefKind::AssocTy,
336+
ImplItemKind::TyAlias(..) => DefKind::AssocTy,
337337
ImplItemKind::OpaqueTy(..) => DefKind::AssocOpaqueTy,
338338
}
339339
}
@@ -1291,7 +1291,7 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId, include_id: bool) -> String {
12911291
ImplItemKind::Method(..) => {
12921292
format!("method {} in {}{}", ii.ident, path_str(), id_str)
12931293
}
1294-
ImplItemKind::Type(_) => {
1294+
ImplItemKind::TyAlias(_) => {
12951295
format!("assoc type {} in {}{}", ii.ident, path_str(), id_str)
12961296
}
12971297
ImplItemKind::OpaqueTy(_) => {

‎src/librustc/hir/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ pub enum ImplItemKind {
18371837
/// A method implementation with the given signature and body.
18381838
Method(MethodSig, BodyId),
18391839
/// An associated type.
1840-
Type(P<Ty>),
1840+
TyAlias(P<Ty>),
18411841
/// An associated `type = impl Trait`.
18421842
OpaqueTy(GenericBounds),
18431843
}

‎src/librustc/hir/print.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ impl<'a> State<'a> {
908908
self.end(); // need to close a box
909909
self.ann.nested(self, Nested::Body(body));
910910
}
911-
hir::ImplItemKind::Type(ref ty) => {
911+
hir::ImplItemKind::TyAlias(ref ty) => {
912912
self.print_associated_type(ii.ident, None, Some(ty));
913913
}
914914
hir::ImplItemKind::OpaqueTy(ref bounds) => {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ impl<'tcx> TyCtxt<'tcx> {
270270
hir::ImplItemKind::Method(..) => "method body",
271271
hir::ImplItemKind::Const(..)
272272
| hir::ImplItemKind::OpaqueTy(..)
273-
| hir::ImplItemKind::Type(..) => "associated item",
273+
| hir::ImplItemKind::TyAlias(..) => "associated item",
274274
}
275275
}
276276

‎src/librustc/middle/dead.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
640640
self.visit_nested_body(body_id)
641641
}
642642
hir::ImplItemKind::OpaqueTy(..) |
643-
hir::ImplItemKind::Type(..) => {}
643+
hir::ImplItemKind::TyAlias(..) => {}
644644
}
645645
}
646646

‎src/librustc/middle/reachable.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
189189
}
190190
}
191191
hir::ImplItemKind::OpaqueTy(..) |
192-
hir::ImplItemKind::Type(_) => false,
192+
hir::ImplItemKind::TyAlias(_) => false,
193193
}
194194
}
195195
Some(_) => false,
@@ -302,7 +302,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
302302
}
303303
}
304304
hir::ImplItemKind::OpaqueTy(..) |
305-
hir::ImplItemKind::Type(_) => {}
305+
hir::ImplItemKind::TyAlias(_) => {}
306306
}
307307
}
308308
Node::Expr(&hir::Expr { node: hir::ExprKind::Closure(.., body, _, _), .. }) => {

‎src/librustc/middle/resolve_lifetime.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
828828
|this| intravisit::walk_impl_item(this, impl_item),
829829
)
830830
}
831-
Type(ref ty) => {
831+
TyAlias(ref ty) => {
832832
let generics = &impl_item.generics;
833833
let mut index = self.next_early_index();
834834
let mut non_lifetime_count = 0;

‎src/librustc_incremental/persist/dirty_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl DirtyCleanVisitor<'tcx> {
405405
match item.node {
406406
ImplItemKind::Method(..) => ("Node::ImplItem", LABELS_FN_IN_IMPL),
407407
ImplItemKind::Const(..) => ("NodeImplConst", LABELS_CONST_IN_IMPL),
408-
ImplItemKind::Type(..) => ("NodeImplType", LABELS_CONST_IN_IMPL),
408+
ImplItemKind::TyAlias(..) => ("NodeImplType", LABELS_CONST_IN_IMPL),
409409
ImplItemKind::OpaqueTy(..) => ("NodeImplType", LABELS_CONST_IN_IMPL),
410410
}
411411
},

‎src/librustc_lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
460460
let desc = match impl_item.node {
461461
hir::ImplItemKind::Const(..) => "an associated constant",
462462
hir::ImplItemKind::Method(..) => "a method",
463-
hir::ImplItemKind::Type(_) => "an associated type",
463+
hir::ImplItemKind::TyAlias(_) => "an associated type",
464464
hir::ImplItemKind::OpaqueTy(_) => "an associated `impl Trait` type",
465465
};
466466
self.check_missing_docs_attrs(cx,

‎src/librustc_metadata/encoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ impl EncodeContext<'tcx> {
980980
needs_inline || is_const_fn || always_encode_mir
981981
},
982982
hir::ImplItemKind::OpaqueTy(..) |
983-
hir::ImplItemKind::Type(..) => false,
983+
hir::ImplItemKind::TyAlias(..) => false,
984984
};
985985

986986
Entry {

‎src/librustc_privacy/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> {
13711371
impl_item_ref.id.hir_id)
13721372
}
13731373
hir::ImplItemKind::OpaqueTy(..) |
1374-
hir::ImplItemKind::Type(_) => false,
1374+
hir::ImplItemKind::TyAlias(_) => false,
13751375
}
13761376
});
13771377

@@ -1397,7 +1397,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> {
13971397
{
13981398
intravisit::walk_impl_item(self, impl_item)
13991399
}
1400-
hir::ImplItemKind::Type(..) => {
1400+
hir::ImplItemKind::TyAlias(..) => {
14011401
intravisit::walk_impl_item(self, impl_item)
14021402
}
14031403
_ => {}
@@ -1423,7 +1423,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ObsoleteVisiblePrivateTypesVisitor<'a, 'tcx> {
14231423
// Those in 3. are warned with this call.
14241424
for impl_item_ref in impl_item_refs {
14251425
let impl_item = self.tcx.hir().impl_item(impl_item_ref.id);
1426-
if let hir::ImplItemKind::Type(ref ty) = impl_item.node {
1426+
if let hir::ImplItemKind::TyAlias(ref ty) = impl_item.node {
14271427
self.visit_ty(ty);
14281428
}
14291429
}

‎src/librustc_resolve/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3079,7 +3079,7 @@ impl<'a> Resolver<'a> {
30793079

30803080
visit::walk_impl_item(this, impl_item);
30813081
}
3082-
ImplItemKind::Type(ref ty) => {
3082+
ImplItemKind::TyAlias(ref ty) => {
30833083
// If this is a trait impl, ensure the type
30843084
// exists in trait
30853085
this.check_trait_item(impl_item.ident,

‎src/librustc_save_analysis/dump_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
11671167
impl_item.span,
11681168
);
11691169
}
1170-
ast::ImplItemKind::Type(ref ty) => {
1170+
ast::ImplItemKind::TyAlias(ref ty) => {
11711171
// FIXME: uses of the assoc type should ideally point to this
11721172
// 'def' and the name here should be a ref to the def in the
11731173
// trait.

‎src/librustc_typeck/check/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ fn check_specialization_validity<'tcx>(
15431543
hir::ImplItemKind::Const(..) => ty::AssocKind::Const,
15441544
hir::ImplItemKind::Method(..) => ty::AssocKind::Method,
15451545
hir::ImplItemKind::OpaqueTy(..) => ty::AssocKind::OpaqueTy,
1546-
hir::ImplItemKind::Type(_) => ty::AssocKind::Type
1546+
hir::ImplItemKind::TyAlias(_) => ty::AssocKind::Type,
15471547
};
15481548

15491549
let parent = ancestors.defs(tcx, trait_item.ident, kind, trait_def.def_id).nth(1)
@@ -1640,7 +1640,7 @@ fn check_impl_items_against_trait<'tcx>(
16401640
}
16411641
}
16421642
hir::ImplItemKind::OpaqueTy(..) |
1643-
hir::ImplItemKind::Type(_) => {
1643+
hir::ImplItemKind::TyAlias(_) => {
16441644
if ty_trait_item.kind == ty::AssocKind::Type {
16451645
if ty_trait_item.defaultness.has_value() {
16461646
overridden_associated_type = Some(impl_item);

‎src/librustc_typeck/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ pub fn checked_type_of(tcx: TyCtxt<'_>, def_id: DefId, fail: bool) -> Option<Ty<
12201220

12211221
find_opaque_ty_constraints(tcx, def_id)
12221222
}
1223-
ImplItemKind::Type(ref ty) => {
1223+
ImplItemKind::TyAlias(ref ty) => {
12241224
if tcx
12251225
.impl_trait_ref(tcx.hir().get_parent_did(hir_id))
12261226
.is_none()

‎src/librustc_typeck/impl_wf_check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ fn enforce_impl_items_are_distinct(tcx: TyCtxt<'_>, impl_item_refs: &[hir::ImplI
189189
for impl_item_ref in impl_item_refs {
190190
let impl_item = tcx.hir().impl_item(impl_item_ref.id);
191191
let seen_items = match impl_item.node {
192-
hir::ImplItemKind::Type(_) => &mut seen_type_items,
192+
hir::ImplItemKind::TyAlias(_) => &mut seen_type_items,
193193
_ => &mut seen_value_items,
194194
};
195195
match seen_items.entry(impl_item.ident.modern()) {

‎src/librustc_typeck/namespace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl<'a> From <&'a hir::ImplItemKind> for Namespace {
2323
fn from(impl_kind: &'a hir::ImplItemKind) -> Self {
2424
match *impl_kind {
2525
hir::ImplItemKind::OpaqueTy(..) |
26-
hir::ImplItemKind::Type(..) => Namespace::Type,
26+
hir::ImplItemKind::TyAlias(..) => Namespace::Type,
2727
hir::ImplItemKind::Const(..) |
2828
hir::ImplItemKind::Method(..) => Namespace::Value,
2929
}

‎src/librustdoc/clean/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2253,7 +2253,7 @@ impl Clean<Item> for hir::ImplItem {
22532253
hir::ImplItemKind::Method(ref sig, body) => {
22542254
MethodItem((sig, &self.generics, body, Some(self.defaultness)).clean(cx))
22552255
}
2256-
hir::ImplItemKind::Type(ref ty) => TypedefItem(Typedef {
2256+
hir::ImplItemKind::TyAlias(ref ty) => TypedefItem(Typedef {
22572257
type_: ty.clean(cx),
22582258
generics: Generics::default(),
22592259
}, true),

‎src/libsyntax/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ pub struct ImplItem {
15081508
pub enum ImplItemKind {
15091509
Const(P<Ty>, P<Expr>),
15101510
Method(MethodSig, P<Block>),
1511-
Type(P<Ty>),
1511+
TyAlias(P<Ty>),
15121512
OpaqueTy(GenericBounds),
15131513
Macro(Mac),
15141514
}

‎src/libsyntax/feature_gate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2254,7 +2254,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
22542254
"`impl Trait` in type aliases is unstable"
22552255
);
22562256
}
2257-
ast::ImplItemKind::Type(_) => {
2257+
ast::ImplItemKind::TyAlias(_) => {
22582258
if !ii.generics.params.is_empty() {
22592259
gate_feature_post!(&self, generic_associated_types, ii.span,
22602260
"generic associated types are unstable");

‎src/libsyntax/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ pub fn noop_flat_map_impl_item<T: MutVisitor>(mut item: ImplItem, visitor: &mut
933933
visit_method_sig(sig, visitor);
934934
visitor.visit_block(body);
935935
}
936-
ImplItemKind::Type(ty) => visitor.visit_ty(ty),
936+
ImplItemKind::TyAlias(ty) => visitor.visit_ty(ty),
937937
ImplItemKind::OpaqueTy(bounds) => visit_bounds(bounds, visitor),
938938
ImplItemKind::Macro(mac) => visitor.visit_mac(mac),
939939
}

‎src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5687,7 +5687,7 @@ impl<'a> Parser<'a> {
56875687
let (name, node, generics) = if let Some(type_) = self.eat_type() {
56885688
let (name, alias, generics) = type_?;
56895689
let kind = match alias {
5690-
AliasKind::Weak(typ) => ast::ImplItemKind::Type(typ),
5690+
AliasKind::Weak(typ) => ast::ImplItemKind::TyAlias(typ),
56915691
AliasKind::OpaqueTy(bounds) => ast::ImplItemKind::OpaqueTy(bounds),
56925692
};
56935693
(name, kind, generics)

‎src/libsyntax/print/pprust.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ impl<'a> State<'a> {
15791579
self.nbsp();
15801580
self.print_block_with_attrs(body, &ii.attrs);
15811581
}
1582-
ast::ImplItemKind::Type(ref ty) => {
1582+
ast::ImplItemKind::TyAlias(ref ty) => {
15831583
self.print_associated_type(ii.ident, None, Some(ty));
15841584
}
15851585
ast::ImplItemKind::OpaqueTy(ref bounds) => {

‎src/libsyntax/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ pub fn walk_impl_item<'a, V: Visitor<'a>>(visitor: &mut V, impl_item: &'a ImplIt
616616
visitor.visit_fn(FnKind::Method(impl_item.ident, sig, Some(&impl_item.vis), body),
617617
&sig.decl, impl_item.span, impl_item.id);
618618
}
619-
ImplItemKind::Type(ref ty) => {
619+
ImplItemKind::TyAlias(ref ty) => {
620620
visitor.visit_ty(ty);
621621
}
622622
ImplItemKind::OpaqueTy(ref bounds) => {

‎src/libsyntax_ext/deriving/generic/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,8 @@ impl<'a> TraitDef<'a> {
529529
defaultness: ast::Defaultness::Final,
530530
attrs: Vec::new(),
531531
generics: Generics::default(),
532-
node: ast::ImplItemKind::Type(type_def.to_ty(cx, self.span, type_ident, generics)),
532+
node: ast::ImplItemKind::TyAlias(
533+
type_def.to_ty(cx, self.span, type_ident, generics)),
533534
tokens: None,
534535
}
535536
});

0 commit comments

Comments
 (0)