Skip to content

Commit 9b4ad01

Browse files
committed
always use GenericArgsRef
1 parent 18fe295 commit 9b4ad01

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

clippy_lints/src/default_union_representation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
22
use rustc_hir::{HirId, Item, ItemKind};
33
use rustc_lint::{LateContext, LateLintPass};
44
use rustc_middle::ty::layout::LayoutOf;
5-
use rustc_middle::ty::{self, FieldDef, GenericArg, List};
5+
use rustc_middle::ty::{self, FieldDef};
66
use rustc_session::declare_lint_pass;
77
use rustc_span::sym;
88

@@ -85,7 +85,7 @@ fn is_union_with_two_non_zst_fields<'tcx>(cx: &LateContext<'tcx>, item: &Item<'t
8585
}
8686
}
8787

88-
fn is_zst<'tcx>(cx: &LateContext<'tcx>, field: &FieldDef, args: &'tcx List<GenericArg<'tcx>>) -> bool {
88+
fn is_zst<'tcx>(cx: &LateContext<'tcx>, field: &FieldDef, args: ty::GenericArgsRef<'tcx>) -> bool {
8989
let ty = field.ty(cx.tcx, args);
9090
if let Ok(layout) = cx.layout_of(ty) {
9191
layout.is_zst()

clippy_lints/src/needless_borrows_for_generic_args.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_infer::infer::TyCtxtInferExt;
1313
use rustc_lint::{LateContext, LateLintPass};
1414
use rustc_middle::mir::{Rvalue, StatementKind};
1515
use rustc_middle::ty::{
16-
self, ClauseKind, EarlyBinder, FnSig, GenericArg, GenericArgKind, List, ParamTy, ProjectionPredicate, Ty,
16+
self, ClauseKind, EarlyBinder, FnSig, GenericArg, GenericArgKind, ParamTy, ProjectionPredicate, Ty,
1717
};
1818
use rustc_session::impl_lint_pass;
1919
use rustc_span::symbol::sym;
@@ -161,7 +161,7 @@ fn needless_borrow_count<'tcx>(
161161
cx: &LateContext<'tcx>,
162162
possible_borrowers: &mut Vec<(LocalDefId, PossibleBorrowerMap<'tcx, 'tcx>)>,
163163
fn_id: DefId,
164-
callee_args: &'tcx List<GenericArg<'tcx>>,
164+
callee_args: ty::GenericArgsRef<'tcx>,
165165
arg_index: usize,
166166
param_ty: ParamTy,
167167
mut expr: &Expr<'tcx>,

clippy_utils/src/ty.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use rustc_middle::traits::EvaluationResult;
1919
use rustc_middle::ty::layout::ValidityRequirement;
2020
use rustc_middle::ty::{
2121
self, AdtDef, AliasTy, AssocKind, Binder, BoundRegion, FnSig, GenericArg, GenericArgKind, GenericArgsRef,
22-
GenericParamDefKind, IntTy, List, ParamEnv, Region, RegionKind, ToPredicate, TraitRef, Ty, TyCtxt,
22+
GenericParamDefKind, IntTy, ParamEnv, Region, RegionKind, ToPredicate, TraitRef, Ty, TyCtxt,
2323
TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor, UintTy, VariantDef, VariantDiscr,
2424
};
2525
use rustc_span::symbol::Ident;
@@ -961,7 +961,11 @@ pub struct AdtVariantInfo {
961961

962962
impl AdtVariantInfo {
963963
/// Returns ADT variants ordered by size
964-
pub fn new<'tcx>(cx: &LateContext<'tcx>, adt: AdtDef<'tcx>, subst: &'tcx List<GenericArg<'tcx>>) -> Vec<Self> {
964+
pub fn new<'tcx>(
965+
cx: &LateContext<'tcx>,
966+
adt: AdtDef<'tcx>,
967+
subst: GenericArgsRef<'tcx>
968+
) -> Vec<Self> {
965969
let mut variants_size = adt
966970
.variants()
967971
.iter()

0 commit comments

Comments
 (0)