Skip to content

Commit be4b026

Browse files
compiler-errorscompiler-errors
committed
ty::KContainer -> ty::AssocItemContainer::K
1 parent 8e6af16 commit be4b026

File tree

21 files changed

+59
-61
lines changed

21 files changed

+59
-61
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ pub fn check_tied_features(
710710
/// applied to the method prototype.
711711
fn should_inherit_track_caller(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
712712
if let Some(impl_item) = tcx.opt_associated_item(def_id)
713-
&& let ty::AssocItemContainer::ImplContainer = impl_item.container
713+
&& let ty::AssocItemContainer::Impl = impl_item.container
714714
&& let Some(trait_item) = impl_item.trait_item_def_id
715715
{
716716
return tcx.codegen_fn_attrs(trait_item).flags.intersects(CodegenFnAttrFlags::TRACK_CALLER);

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,8 @@ fn compare_self_type<'tcx>(
11891189

11901190
let self_string = |method: ty::AssocItem| {
11911191
let untransformed_self_ty = match method.container {
1192-
ty::ImplContainer => impl_trait_ref.self_ty(),
1193-
ty::TraitContainer => tcx.types.self_param,
1192+
ty::AssocItemContainer::Impl => impl_trait_ref.self_ty(),
1193+
ty::AssocItemContainer::Trait => tcx.types.self_param,
11941194
};
11951195
let self_arg_ty = tcx.fn_sig(method.def_id).instantiate_identity().input(0);
11961196
let param_env = ty::ParamEnv::reveal_all();
@@ -2224,10 +2224,8 @@ fn param_env_with_gat_bounds<'tcx>(
22242224

22252225
for impl_ty in impl_tys_to_install {
22262226
let trait_ty = match impl_ty.container {
2227-
ty::AssocItemContainer::TraitContainer => impl_ty,
2228-
ty::AssocItemContainer::ImplContainer => {
2229-
tcx.associated_item(impl_ty.trait_item_def_id.unwrap())
2230-
}
2227+
ty::AssocItemContainer::Trait => impl_ty,
2228+
ty::AssocItemContainer::Impl => tcx.associated_item(impl_ty.trait_item_def_id.unwrap()),
22312229
};
22322230

22332231
let mut bound_vars: smallvec::SmallVec<[ty::BoundVariableKind; 8]> =

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1048,8 +1048,10 @@ fn check_associated_item(
10481048
.coherent_trait(tcx.parent(item.trait_item_def_id.unwrap_or(item_id.into())))?;
10491049

10501050
let self_ty = match item.container {
1051-
ty::TraitContainer => tcx.types.self_param,
1052-
ty::ImplContainer => tcx.type_of(item.container_id(tcx)).instantiate_identity(),
1051+
ty::AssocItemContainer::Trait => tcx.types.self_param,
1052+
ty::AssocItemContainer::Impl => {
1053+
tcx.type_of(item.container_id(tcx)).instantiate_identity()
1054+
}
10531055
};
10541056

10551057
match item.kind {
@@ -1072,7 +1074,7 @@ fn check_associated_item(
10721074
check_method_receiver(wfcx, hir_sig, item, self_ty)
10731075
}
10741076
ty::AssocKind::Type => {
1075-
if let ty::AssocItemContainer::TraitContainer = item.container {
1077+
if let ty::AssocItemContainer::Trait = item.container {
10761078
check_associated_type_bounds(wfcx, item, span)
10771079
}
10781080
if item.defaultness(tcx).has_value() {

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10251025
let container_id = assoc_item.container_id(tcx);
10261026
debug!(?def_id, ?container, ?container_id);
10271027
match container {
1028-
ty::TraitContainer => {
1028+
ty::AssocItemContainer::Trait => {
10291029
if let Err(e) = callee::check_legal_trait_for_method_call(
10301030
tcx,
10311031
path_span,
@@ -1037,7 +1037,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10371037
self.set_tainted_by_errors(e);
10381038
}
10391039
}
1040-
ty::ImplContainer => {
1040+
ty::AssocItemContainer::Impl => {
10411041
if segments.len() == 1 {
10421042
// `<T>::assoc` will end up here, and so
10431043
// can `T::assoc`. If this came from an

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
17961796
false,
17971797
|did| {
17981798
let assoc_item = self.tcx.associated_item(did);
1799-
assoc_item.container == ty::AssocItemContainer::TraitContainer
1799+
assoc_item.container == ty::AssocItemContainer::Trait
18001800
&& assoc_item.container_id(self.tcx) == clone_trait_did
18011801
},
18021802
)

‎compiler/rustc_hir_typeck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn infer_type_if_missing<'tcx>(fcx: &FnCtxt<'_, 'tcx>, node: Node<'tcx>) -> Opti
239239
let expected_type = if let Some(&hir::Ty { kind: hir::TyKind::Infer, span, .. }) = node.ty() {
240240
if let Some(item) = tcx.opt_associated_item(def_id.into())
241241
&& let ty::AssocKind::Const = item.kind
242-
&& let ty::ImplContainer = item.container
242+
&& let ty::AssocItemContainer::Impl = item.container
243243
&& let Some(trait_item_def_id) = item.trait_item_def_id
244244
{
245245
let impl_def_id = item.container_id(tcx);

‎compiler/rustc_hir_typeck/src/method/probe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
480480
ProbeScope::Single(def_id) => {
481481
let item = self.tcx.associated_item(def_id);
482482
// FIXME(fn_delegation): Delegation to inherent methods is not yet supported.
483-
assert_eq!(item.container, AssocItemContainer::TraitContainer);
483+
assert_eq!(item.container, AssocItemContainer::Trait);
484484

485485
let trait_def_id = self.tcx.parent(def_id);
486486
let trait_span = self.tcx.def_span(trait_def_id);
@@ -1406,7 +1406,7 @@ impl<'tcx> Pick<'tcx> {
14061406
tcx.def_path_str(self.item.def_id),
14071407
));
14081408
}
1409-
(ty::AssocKind::Const, ty::AssocItemContainer::TraitContainer) => {
1409+
(ty::AssocKind::Const, ty::AssocItemContainer::Trait) => {
14101410
let def_id = self.item.container_id(tcx);
14111411
lint.span_suggestion(
14121412
span,

‎compiler/rustc_lint/src/nonstandard_style.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub(crate) enum MethodLateContext {
2626
pub(crate) fn method_context(cx: &LateContext<'_>, id: LocalDefId) -> MethodLateContext {
2727
let item = cx.tcx.associated_item(id);
2828
match item.container {
29-
ty::TraitContainer => MethodLateContext::TraitAutoImpl,
30-
ty::ImplContainer => match cx.tcx.impl_trait_ref(item.container_id(cx.tcx)) {
29+
ty::AssocItemContainer::Trait => MethodLateContext::TraitAutoImpl,
30+
ty::AssocItemContainer::Impl => match cx.tcx.impl_trait_ref(item.container_id(cx.tcx)) {
3131
Some(_) => MethodLateContext::TraitImpl,
3232
None => MethodLateContext::PlainImpl,
3333
},

‎compiler/rustc_metadata/src/rmeta/encoder.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1203,8 +1203,8 @@ fn should_encode_type(tcx: TyCtxt<'_>, def_id: LocalDefId, def_kind: DefKind) ->
12031203
DefKind::AssocTy => {
12041204
let assoc_item = tcx.associated_item(def_id);
12051205
match assoc_item.container {
1206-
ty::AssocItemContainer::ImplContainer => true,
1207-
ty::AssocItemContainer::TraitContainer => assoc_item.defaultness(tcx).has_value(),
1206+
ty::AssocItemContainer::Impl => true,
1207+
ty::AssocItemContainer::Trait => assoc_item.defaultness(tcx).has_value(),
12081208
}
12091209
}
12101210
DefKind::TyParam => {
@@ -1336,7 +1336,7 @@ fn should_encode_const(def_kind: DefKind) -> bool {
13361336

13371337
fn should_encode_fn_impl_trait_in_trait<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> bool {
13381338
if let Some(assoc_item) = tcx.opt_associated_item(def_id)
1339-
&& assoc_item.container == ty::AssocItemContainer::TraitContainer
1339+
&& assoc_item.container == ty::AssocItemContainer::Trait
13401340
&& assoc_item.kind == ty::AssocKind::Fn
13411341
{
13421342
true
@@ -1649,7 +1649,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16491649
self.tables.assoc_container.set_some(def_id.index, item.container);
16501650

16511651
match item.container {
1652-
AssocItemContainer::TraitContainer => {
1652+
AssocItemContainer::Trait => {
16531653
if let ty::AssocKind::Type = item.kind {
16541654
self.encode_explicit_item_bounds(def_id);
16551655
self.encode_explicit_item_super_predicates(def_id);
@@ -1659,7 +1659,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16591659
}
16601660
}
16611661
}
1662-
AssocItemContainer::ImplContainer => {
1662+
AssocItemContainer::Impl => {
16631663
if let Some(trait_item_def_id) = item.trait_item_def_id {
16641664
self.tables.trait_item_def_id.set_some(def_id.index, trait_item_def_id.into());
16651665
}

‎compiler/rustc_metadata/src/rmeta/table.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ fixed_size_enum! {
223223

224224
fixed_size_enum! {
225225
ty::AssocItemContainer {
226-
( TraitContainer )
227-
( ImplContainer )
226+
( Trait )
227+
( Impl )
228228
}
229229
}
230230

‎compiler/rustc_middle/src/ty/assoc.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use crate::ty;
1010

1111
#[derive(Clone, Copy, PartialEq, Eq, Debug, HashStable, Hash, Encodable, Decodable)]
1212
pub enum AssocItemContainer {
13-
TraitContainer,
14-
ImplContainer,
13+
Trait,
14+
Impl,
1515
}
1616

1717
/// Information about an associated item
@@ -63,16 +63,16 @@ impl AssocItem {
6363
#[inline]
6464
pub fn trait_container(&self, tcx: TyCtxt<'_>) -> Option<DefId> {
6565
match self.container {
66-
AssocItemContainer::ImplContainer => None,
67-
AssocItemContainer::TraitContainer => Some(tcx.parent(self.def_id)),
66+
AssocItemContainer::Impl => None,
67+
AssocItemContainer::Trait => Some(tcx.parent(self.def_id)),
6868
}
6969
}
7070

7171
#[inline]
7272
pub fn impl_container(&self, tcx: TyCtxt<'_>) -> Option<DefId> {
7373
match self.container {
74-
AssocItemContainer::ImplContainer => Some(tcx.parent(self.def_id)),
75-
AssocItemContainer::TraitContainer => None,
74+
AssocItemContainer::Impl => Some(tcx.parent(self.def_id)),
75+
AssocItemContainer::Trait => None,
7676
}
7777
}
7878

‎compiler/rustc_middle/src/ty/instance.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ impl<'tcx> Instance<'tcx> {
690690
&& !matches!(
691691
tcx.opt_associated_item(def),
692692
Some(ty::AssocItem {
693-
container: ty::AssocItemContainer::TraitContainer,
693+
container: ty::AssocItemContainer::Trait,
694694
..
695695
})
696696
)

‎compiler/rustc_middle/src/ty/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ use tracing::{debug, instrument};
5555
pub use vtable::*;
5656
use {rustc_ast as ast, rustc_attr as attr, rustc_hir as hir};
5757

58-
pub use self::AssocItemContainer::*;
5958
pub use self::BorrowKind::*;
60-
pub use self::IntVarValue::*;
6159
pub use self::closure::{
6260
BorrowKind, CAPTURE_STRUCT_LOCAL, CaptureInfo, CapturedPlace, ClosureTypeInfo,
6361
MinCaptureInformationMap, MinCaptureList, RootVariableMinCaptureList, UpvarCapture, UpvarId,
@@ -2074,7 +2072,7 @@ impl<'tcx> TyCtxt<'tcx> {
20742072
let Some(item) = self.opt_associated_item(def_id) else {
20752073
return false;
20762074
};
2077-
if item.container != ty::AssocItemContainer::ImplContainer {
2075+
if item.container != ty::AssocItemContainer::Impl {
20782076
return false;
20792077
}
20802078

‎compiler/rustc_middle/src/util/call_kind.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ pub fn call_kind<'tcx>(
7272
let parent = tcx.opt_associated_item(method_did).and_then(|assoc| {
7373
let container_id = assoc.container_id(tcx);
7474
match assoc.container {
75-
AssocItemContainer::ImplContainer => tcx.trait_id_of_impl(container_id),
76-
AssocItemContainer::TraitContainer => Some(container_id),
75+
AssocItemContainer::Impl => tcx.trait_id_of_impl(container_id),
76+
AssocItemContainer::Trait => Some(container_id),
7777
}
7878
});
7979

‎compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/static_impl_trait.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
5959
let simple_ident = param.param.pat.simple_ident();
6060

6161
let (has_impl_path, impl_path) = match ctxt.assoc_item.container {
62-
AssocItemContainer::TraitContainer => {
62+
AssocItemContainer::Trait => {
6363
let id = ctxt.assoc_item.container_id(tcx);
6464
(true, tcx.def_path_str(id))
6565
}
66-
AssocItemContainer::ImplContainer => (false, String::new()),
66+
AssocItemContainer::Impl => (false, String::new()),
6767
};
6868

6969
let mut err = self.tcx().dcx().create_err(ButCallingIntroduces {

‎compiler/rustc_ty_utils/src/assoc.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fn associated_item_from_trait_item_ref(trait_item_ref: &hir::TraitItemRef) -> ty
140140
kind,
141141
def_id: owner_id.to_def_id(),
142142
trait_item_def_id: Some(owner_id.to_def_id()),
143-
container: ty::TraitContainer,
143+
container: ty::AssocItemContainer::Trait,
144144
fn_has_self_parameter: has_self,
145145
opt_rpitit_info: None,
146146
}
@@ -159,7 +159,7 @@ fn associated_item_from_impl_item_ref(impl_item_ref: &hir::ImplItemRef) -> ty::A
159159
kind,
160160
def_id: def_id.to_def_id(),
161161
trait_item_def_id: impl_item_ref.trait_item_def_id,
162-
container: ty::ImplContainer,
162+
container: ty::AssocItemContainer::Impl,
163163
fn_has_self_parameter: has_self,
164164
opt_rpitit_info: None,
165165
}
@@ -267,7 +267,7 @@ fn associated_type_for_impl_trait_in_trait(
267267
kind: ty::AssocKind::Type,
268268
def_id,
269269
trait_item_def_id: None,
270-
container: ty::TraitContainer,
270+
container: ty::AssocItemContainer::Trait,
271271
fn_has_self_parameter: false,
272272
opt_rpitit_info: Some(ImplTraitInTraitData::Trait {
273273
fn_def_id: fn_def_id.to_def_id(),
@@ -319,7 +319,7 @@ fn associated_type_for_impl_trait_in_impl(
319319
kind: ty::AssocKind::Type,
320320
def_id,
321321
trait_item_def_id: Some(trait_assoc_def_id),
322-
container: ty::ImplContainer,
322+
container: ty::AssocItemContainer::Impl,
323323
fn_has_self_parameter: false,
324324
opt_rpitit_info: Some(ImplTraitInTraitData::Impl { fn_def_id: impl_fn_def_id.to_def_id() }),
325325
});

‎compiler/rustc_ty_utils/src/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
135135

136136
if tcx.def_kind(def_id) == DefKind::AssocFn
137137
&& let assoc_item = tcx.associated_item(def_id)
138-
&& assoc_item.container == ty::AssocItemContainer::TraitContainer
138+
&& assoc_item.container == ty::AssocItemContainer::Trait
139139
&& assoc_item.defaultness(tcx).has_value()
140140
{
141141
let sig = tcx.fn_sig(def_id).instantiate_identity();

‎src/librustdoc/clean/mod.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1317,8 +1317,8 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13171317
simplify::move_bounds_to_generic_parameters(&mut generics);
13181318

13191319
let provided = match assoc_item.container {
1320-
ty::ImplContainer => true,
1321-
ty::TraitContainer => tcx.defaultness(assoc_item.def_id).has_value(),
1320+
ty::AssocItemContainer::Impl => true,
1321+
ty::AssocItemContainer::Trait => tcx.defaultness(assoc_item.def_id).has_value(),
13221322
};
13231323
if provided {
13241324
AssocConstItem(Box::new(Constant {
@@ -1335,10 +1335,10 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13351335

13361336
if assoc_item.fn_has_self_parameter {
13371337
let self_ty = match assoc_item.container {
1338-
ty::ImplContainer => {
1338+
ty::AssocItemContainer::Impl => {
13391339
tcx.type_of(assoc_item.container_id(tcx)).instantiate_identity()
13401340
}
1341-
ty::TraitContainer => tcx.types.self_param,
1341+
ty::AssocItemContainer::Trait => tcx.types.self_param,
13421342
};
13431343
let self_arg_ty =
13441344
tcx.fn_sig(assoc_item.def_id).instantiate_identity().input(0).skip_binder();
@@ -1355,13 +1355,13 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13551355
}
13561356

13571357
let provided = match assoc_item.container {
1358-
ty::ImplContainer => true,
1359-
ty::TraitContainer => assoc_item.defaultness(tcx).has_value(),
1358+
ty::AssocItemContainer::Impl => true,
1359+
ty::AssocItemContainer::Trait => assoc_item.defaultness(tcx).has_value(),
13601360
};
13611361
if provided {
13621362
let defaultness = match assoc_item.container {
1363-
ty::ImplContainer => Some(assoc_item.defaultness(tcx)),
1364-
ty::TraitContainer => None,
1363+
ty::AssocItemContainer::Impl => Some(assoc_item.defaultness(tcx)),
1364+
ty::AssocItemContainer::Trait => None,
13651365
};
13661366
MethodItem(item, defaultness)
13671367
} else {
@@ -1392,7 +1392,7 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13921392
}
13931393

13941394
let mut predicates = tcx.explicit_predicates_of(assoc_item.def_id).predicates;
1395-
if let ty::TraitContainer = assoc_item.container {
1395+
if let ty::AssocItemContainer::Trait = assoc_item.container {
13961396
let bounds = tcx.explicit_item_bounds(assoc_item.def_id).iter_identity_copied();
13971397
predicates = tcx.arena.alloc_from_iter(bounds.chain(predicates.iter().copied()));
13981398
}
@@ -1403,7 +1403,7 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
14031403
});
14041404
simplify::move_bounds_to_generic_parameters(&mut generics);
14051405

1406-
if let ty::TraitContainer = assoc_item.container {
1406+
if let ty::AssocItemContainer::Trait = assoc_item.container {
14071407
// Move bounds that are (likely) directly attached to the associated type
14081408
// from the where-clause to the associated type.
14091409
// There is no guarantee that this is what the user actually wrote but we have

‎src/librustdoc/clean/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@ impl Item {
703703
| TyMethodItem(..) | MethodItem(..) => {
704704
let assoc_item = tcx.associated_item(def_id);
705705
let is_trait_item = match assoc_item.container {
706-
ty::TraitContainer => true,
707-
ty::ImplContainer => {
706+
ty::AssocItemContainer::Trait => true,
707+
ty::AssocItemContainer::Impl => {
708708
// Trait impl items always inherit the impl's visibility --
709709
// we don't want to show `pub`.
710710
tcx.impl_trait_ref(tcx.parent(assoc_item.def_id)).is_some()

‎src/tools/clippy/clippy_lints/src/missing_inline.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use clippy_utils::diagnostics::span_lint;
22
use rustc_ast::ast;
33
use rustc_hir as hir;
44
use rustc_lint::{LateContext, LateLintPass, LintContext};
5+
use rustc_middle::ty::AssocItemContainer;
56
use rustc_session::declare_lint_pass;
67
use rustc_span::{Span, sym};
78

@@ -138,7 +139,6 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
138139
}
139140

140141
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, impl_item: &'tcx hir::ImplItem<'_>) {
141-
use rustc_middle::ty::{ImplContainer, TraitContainer};
142142
if rustc_middle::lint::in_external_macro(cx.sess(), impl_item.span) || is_executable_or_proc_macro(cx) {
143143
return;
144144
}
@@ -156,8 +156,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
156156
let assoc_item = cx.tcx.associated_item(impl_item.owner_id);
157157
let container_id = assoc_item.container_id(cx.tcx);
158158
let trait_def_id = match assoc_item.container {
159-
TraitContainer => Some(container_id),
160-
ImplContainer => cx.tcx.impl_trait_ref(container_id).map(|t| t.skip_binder().def_id),
159+
AssocItemContainer::Trait => Some(container_id),
160+
AssocItemContainer::Impl => cx.tcx.impl_trait_ref(container_id).map(|t| t.skip_binder().def_id),
161161
};
162162

163163
if let Some(trait_def_id) = trait_def_id {

0 commit comments

Comments
 (0)