Skip to content

Commit eba9934

Browse files
nnethercotennethercote
committed
Always use ty:: qualifier for TyKind enum variants.
Because that's the way it should be done.
1 parent cbd3ad6 commit eba9934

File tree

12 files changed

+31
-30
lines changed

12 files changed

+31
-30
lines changed

‎compiler/rustc_const_eval/src/transform/check_consts/ops.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ use rustc_infer::infer::TyCtxtInferExt;
99
use rustc_infer::traits::{ImplSource, Obligation, ObligationCause};
1010
use rustc_middle::mir::{self, CallSource};
1111
use rustc_middle::ty::print::with_no_trimmed_paths;
12-
use rustc_middle::ty::TraitRef;
13-
use rustc_middle::ty::{suggest_constraining_type_param, Adt, Closure, FnDef, FnPtr, Param, Ty};
14-
use rustc_middle::ty::{GenericArgKind, GenericArgsRef};
12+
use rustc_middle::ty::{
13+
self as middle_ty, suggest_constraining_type_param, Closure, FnDef, FnPtr, GenericArgKind,
14+
GenericArgsRef, Param, TraitRef, Ty,
15+
};
1516
use rustc_middle::util::{call_kind, CallDesugaringKind, CallKind};
1617
use rustc_session::parse::feature_err;
1718
use rustc_span::symbol::sym;
@@ -123,7 +124,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
123124
);
124125
}
125126
}
126-
Adt(..) => {
127+
middle_ty::Adt(..) => {
127128
let obligation =
128129
Obligation::new(tcx, ObligationCause::dummy(), param_env, trait_ref);
129130

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use hir::ItemKind;
88
use rustc_errors::Applicability;
99
use rustc_hir as hir;
1010
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
11-
use rustc_middle::ty::{Adt, Array, Ref, Ty};
11+
use rustc_middle::ty::{self, Ty};
1212
use rustc_session::lint::builtin::RUST_2021_PRELUDE_COLLISIONS;
1313
use rustc_span::symbol::kw::{Empty, Underscore};
1414
use rustc_span::symbol::{sym, Ident};
@@ -44,7 +44,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
4444
// but `[T; N].into_iter()` doesn't resolve to IntoIterator::into_iter
4545
// before Rust 2021, which results in the same problem.
4646
// It is only a problem for arrays.
47-
sym::into_iter if let Array(..) = self_ty.kind() => {
47+
sym::into_iter if let ty::Array(..) = self_ty.kind() => {
4848
// In this case, it wasn't really a prelude addition that was the problem.
4949
// Instead, the problem is that the array-into_iter hack will no longer apply in Rust 2021.
5050
rustc_lint::ARRAY_INTO_ITER
@@ -64,7 +64,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
6464
pick.autoref_or_ptr_adjustment,
6565
Some(probe::AutorefOrPtrAdjustment::Autoref { .. })
6666
)
67-
&& matches!(self_ty.kind(), Ref(..))
67+
&& matches!(self_ty.kind(), ty::Ref(..))
6868
{
6969
return;
7070
}
@@ -280,7 +280,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
280280
// the user has written the self type with generics already which we (naively) do by looking
281281
// for a "<" in `self_ty_name`.
282282
if !self_ty_name.contains('<') {
283-
if let Adt(def, _) = self_ty.kind() {
283+
if let ty::Adt(def, _) = self_ty.kind() {
284284
let generics = self.tcx.generics_of(def.did());
285285
if !generics.params.is_empty() {
286286
let counts = generics.own_counts();

‎compiler/rustc_hir_typeck/src/pat.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_hir::{HirId, Pat, PatKind};
1212
use rustc_infer::infer;
1313
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
1414
use rustc_middle::mir::interpret::ErrorHandled;
15-
use rustc_middle::ty::{self, Adt, BindingMode, Ty, TypeVisitableExt};
15+
use rustc_middle::ty::{self, BindingMode, Ty, TypeVisitableExt};
1616
use rustc_session::lint::builtin::NON_EXHAUSTIVE_OMITTED_PATTERNS;
1717
use rustc_span::edit_distance::find_best_match_for_name;
1818
use rustc_span::hygiene::DesugaringKind;
@@ -1007,7 +1007,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10071007
}
10081008
_ => {
10091009
let (type_def_id, item_def_id) = match pat_ty.kind() {
1010-
Adt(def, _) => match res {
1010+
ty::Adt(def, _) => match res {
10111011
Res::Def(DefKind::Const, def_id) => (Some(def.did()), Some(def_id)),
10121012
_ => (None, None),
10131013
},

‎src/librustdoc/html/render/type_layout.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use askama::Template;
33
use rustc_data_structures::captures::Captures;
44
use rustc_hir::def_id::DefId;
55
use rustc_middle::span_bug;
6-
use rustc_middle::ty::layout::LayoutError;
7-
use rustc_middle::ty::Adt;
6+
use rustc_middle::ty::{self, layout::LayoutError};
87
use rustc_span::symbol::Symbol;
98
use rustc_target::abi::{Primitive, TagEncoding, Variants};
109

@@ -57,7 +56,7 @@ pub(crate) fn document_type_layout<'a, 'cx: 'a>(
5756
variants
5857
.iter_enumerated()
5958
.map(|(variant_idx, variant_layout)| {
60-
let Adt(adt, _) = type_layout.ty.kind() else {
59+
let ty::Adt(adt, _) = type_layout.ty.kind() else {
6160
span_bug!(tcx.def_span(ty_def_id), "not an adt")
6261
};
6362
let name = adt.variant(variant_idx).name;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_hir::{
99
};
1010
use rustc_lint::{LateContext, LateLintPass};
1111
use rustc_middle::ty::adjustment::{Adjust, PointerCoercion};
12-
use rustc_middle::ty::{self, Adt, AdtDef, GenericArgsRef, Ty, TypeckResults};
12+
use rustc_middle::ty::{self, AdtDef, GenericArgsRef, Ty, TypeckResults};
1313
use rustc_session::impl_lint_pass;
1414
use rustc_span::sym;
1515

@@ -198,7 +198,7 @@ impl<'tcx> LateLintPass<'tcx> for DerivableImpls {
198198
&& let Node::ImplItem(impl_item) = cx.tcx.hir_node(impl_item_hir)
199199
&& let ImplItemKind::Fn(_, b) = &impl_item.kind
200200
&& let Body { value: func_expr, .. } = cx.tcx.hir().body(*b)
201-
&& let &Adt(adt_def, args) = cx.tcx.type_of(item.owner_id).instantiate_identity().kind()
201+
&& let &ty::Adt(adt_def, args) = cx.tcx.type_of(item.owner_id).instantiate_identity().kind()
202202
&& let attrs = cx.tcx.hir().attrs(item.hir_id())
203203
&& !attrs.iter().any(|attr| attr.doc_str().is_some())
204204
&& cx.tcx.hir().attrs(impl_item_hir).is_empty()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use clippy_utils::ty::is_c_void;
44
use rustc_hir::def_id::DefId;
55
use rustc_hir::{Expr, ExprKind, QPath};
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_middle::ty::{RawPtr, TypeAndMut};
7+
use rustc_middle::ty::{self, TypeAndMut};
88
use rustc_session::declare_lint_pass;
99
use rustc_span::sym;
1010

@@ -44,7 +44,7 @@ impl LateLintPass<'_> for FromRawWithVoidPtr {
4444
&& seg.ident.name == sym!(from_raw)
4545
&& let Some(type_str) = path_def_id(cx, ty).and_then(|id| def_id_matches_type(cx, id))
4646
&& let arg_kind = cx.typeck_results().expr_ty(arg).kind()
47-
&& let RawPtr(TypeAndMut { ty, .. }) = arg_kind
47+
&& let ty::RawPtr(TypeAndMut { ty, .. }) = arg_kind
4848
&& is_c_void(cx, *ty)
4949
{
5050
let msg = format!("creating a `{type_str}` from a void raw pointer");

‎src/tools/clippy/clippy_lints/src/functions/result.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use rustc_errors::Diag;
22
use rustc_hir as hir;
33
use rustc_lint::{LateContext, LintContext};
44
use rustc_middle::lint::in_external_macro;
5-
use rustc_middle::ty::{self, Adt, Ty};
5+
use rustc_middle::ty::{self, Ty};
66
use rustc_span::{sym, Span};
77

88
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
@@ -86,7 +86,7 @@ fn check_result_unit_err(cx: &LateContext<'_>, err_ty: Ty<'_>, fn_header_span: S
8686
}
8787

8888
fn check_result_large_err<'tcx>(cx: &LateContext<'tcx>, err_ty: Ty<'tcx>, hir_ty_span: Span, large_err_threshold: u64) {
89-
if let Adt(adt, subst) = err_ty.kind()
89+
if let ty::Adt(adt, subst) = err_ty.kind()
9090
&& let Some(local_def_id) = err_ty
9191
.ty_adt_def()
9292
.expect("already checked this is adt")

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_data_structures::packed::Pu128;
77
use rustc_errors::Applicability;
88
use rustc_hir::{BinOpKind, Block, Expr, ExprKind, Stmt, StmtKind};
99
use rustc_lint::{LateContext, LateLintPass};
10-
use rustc_middle::ty::{Int, IntTy, Ty, Uint, UintTy};
10+
use rustc_middle::ty::{IntTy, Ty, UintTy};
1111
use rustc_session::declare_lint_pass;
1212

1313
declare_clippy_lint! {
@@ -97,6 +97,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingAdd {
9797
}
9898

9999
fn get_int_max(ty: Ty<'_>) -> Option<u128> {
100+
use rustc_middle::ty::{Int, Uint};
100101
match ty.peel_refs().kind() {
101102
Int(IntTy::I8) => i8::MAX.try_into().ok(),
102103
Int(IntTy::I16) => i16::MAX.try_into().ok(),

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_errors::Applicability;
77
use rustc_hir::{Item, ItemKind};
88
use rustc_lint::{LateContext, LateLintPass};
99
use rustc_middle::lint::in_external_macro;
10-
use rustc_middle::ty::{Adt, Ty};
10+
use rustc_middle::ty::{self, Ty};
1111
use rustc_session::impl_lint_pass;
1212
use rustc_span::Span;
1313

@@ -82,7 +82,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeEnumVariant {
8282
}
8383
if let ItemKind::Enum(ref def, _) = item.kind {
8484
let ty = cx.tcx.type_of(item.owner_id).instantiate_identity();
85-
let Adt(adt, subst) = ty.kind() else {
85+
let ty::Adt(adt, subst) = ty.kind() else {
8686
panic!("already checked whether this is an enum")
8787
};
8888
if adt.variants().len() <= 1 {
@@ -167,7 +167,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeEnumVariant {
167167
}
168168

169169
fn maybe_copy<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
170-
if let Adt(_def, args) = ty.kind()
170+
if let ty::Adt(_def, args) = ty.kind()
171171
&& args.types().next().is_some()
172172
&& let Some(copy_trait) = cx.tcx.lang_items().copy_trait()
173173
{

‎src/tools/clippy/clippy_lints/src/methods/unnecessary_join.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_ast::ast::LitKind;
44
use rustc_errors::Applicability;
55
use rustc_hir::{Expr, ExprKind, LangItem};
66
use rustc_lint::LateContext;
7-
use rustc_middle::ty::{Ref, Slice};
7+
use rustc_middle::ty;
88
use rustc_span::Span;
99

1010
use super::UNNECESSARY_JOIN;
@@ -18,9 +18,9 @@ pub(super) fn check<'tcx>(
1818
) {
1919
let applicability = Applicability::MachineApplicable;
2020
let collect_output_adjusted_type = cx.typeck_results().expr_ty_adjusted(join_self_arg);
21-
if let Ref(_, ref_type, _) = collect_output_adjusted_type.kind()
21+
if let ty::Ref(_, ref_type, _) = collect_output_adjusted_type.kind()
2222
// the turbofish for collect is ::<Vec<String>>
23-
&& let Slice(slice) = ref_type.kind()
23+
&& let ty::Slice(slice) = ref_type.kind()
2424
&& is_type_lang_item(cx, *slice, LangItem::String)
2525
// the argument for join is ""
2626
&& let ExprKind::Lit(spanned) = &join_arg.kind

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use clippy_utils::{def_path_def_ids, trait_ref_of_method};
44
use rustc_data_structures::fx::FxHashSet;
55
use rustc_hir as hir;
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_middle::ty::{Adt, Ty};
7+
use rustc_middle::ty::{self, Ty};
88
use rustc_session::impl_lint_pass;
99
use rustc_span::def_id::LocalDefId;
1010
use rustc_span::symbol::sym;
@@ -153,7 +153,7 @@ impl MutableKeyType {
153153
// generics (because the compiler cannot ensure immutability for unknown types).
154154
fn check_ty_<'tcx>(&self, cx: &LateContext<'tcx>, span: Span, ty: Ty<'tcx>) {
155155
let ty = ty.peel_refs();
156-
if let Adt(def, args) = ty.kind() {
156+
if let ty::Adt(def, args) = ty.kind() {
157157
let is_keyed_type = [sym::HashMap, sym::BTreeMap, sym::HashSet, sym::BTreeSet]
158158
.iter()
159159
.any(|diag_item| cx.tcx.is_diagnostic_item(*diag_item, def.did()));

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_hir::{self as hir, HirId, ItemKind, Node};
44
use rustc_hir_analysis::hir_ty_to_ty;
55
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_middle::ty::layout::LayoutOf as _;
7-
use rustc_middle::ty::{Adt, Ty, TypeVisitableExt};
7+
use rustc_middle::ty::{self, Ty, TypeVisitableExt};
88
use rustc_session::declare_lint_pass;
99
use rustc_span::sym;
1010

@@ -49,7 +49,7 @@ impl LateLintPass<'_> for ZeroSizedMapValues {
4949
&& !in_trait_impl(cx, hir_ty.hir_id)
5050
&& let ty = ty_from_hir_ty(cx, hir_ty)
5151
&& (is_type_diagnostic_item(cx, ty, sym::HashMap) || is_type_diagnostic_item(cx, ty, sym::BTreeMap))
52-
&& let Adt(_, args) = ty.kind()
52+
&& let ty::Adt(_, args) = ty.kind()
5353
&& let ty = args.type_at(1)
5454
// Fixes https://github.com/rust-lang/rust-clippy/issues/7447 because of
5555
// https://github.com/rust-lang/rust/blob/master/compiler/rustc_middle/src/ty/sty.rs#L968

0 commit comments

Comments
 (0)