Skip to content

Commit 9523b3f

Browse files
Rename Generics::params to Generics::own_params
1 parent 18fe295 commit 9523b3f

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

clippy_lints/src/dereference.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ impl<'tcx> LateLintPass<'tcx> for Dereferencing<'tcx> {
382382
cx,
383383
impl_ty,
384384
trait_id,
385-
&args[..cx.tcx.generics_of(trait_id).params.len() - 1],
385+
&args[..cx.tcx.generics_of(trait_id).own_params.len() - 1],
386386
)
387387
{
388388
false

clippy_lints/src/derive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ fn param_env_for_derived_eq(tcx: TyCtxt<'_>, did: DefId, eq_trait_id: DefId) ->
480480
// Vec<(param_def, needs_eq)>
481481
let mut params = tcx
482482
.generics_of(did)
483-
.params
483+
.own_params
484484
.iter()
485485
.map(|p| (p, matches!(p.kind, GenericParamDefKind::Type { .. })))
486486
.collect::<Vec<_>>();

clippy_lints/src/implied_bounds_in_impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ fn try_resolve_type<'tcx>(
148148
match args.get(index - 1) {
149149
Some(GenericArg::Type(ty)) => Some(lower_ty(tcx, ty)),
150150
Some(_) => None,
151-
None => Some(tcx.type_of(generics.params[index].def_id).skip_binder()),
151+
None => Some(tcx.type_of(generics.own_params[index].def_id).skip_binder()),
152152
}
153153
}
154154

clippy_lints/src/iter_without_into_iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl {self_ty_without_ref} {{
225225
&& let ImplItemKind::Fn(sig, _) = item.kind
226226
&& let FnRetTy::Return(ret) = sig.decl.output
227227
&& is_nameable_in_impl_trait(ret)
228-
&& cx.tcx.generics_of(item_did).params.is_empty()
228+
&& cx.tcx.generics_of(item_did).own_params.is_empty()
229229
&& sig.decl.implicit_self == expected_implicit_self
230230
&& sig.decl.inputs.len() == 1
231231
&& let Some(imp) = get_parent_as_impl(cx.tcx, item.hir_id())

clippy_lints/src/mismatching_type_param_order.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'tcx> LateLintPass<'tcx> for TypeParamMismatch {
7676
};
7777

7878
// get the names of the generic parameters in the type
79-
let type_params = &cx.tcx.generics_of(defid).params;
79+
let type_params = &cx.tcx.generics_of(defid).own_params;
8080
let type_param_names: Vec<_> = type_params
8181
.iter()
8282
.filter_map(|p| match p.kind {

clippy_utils/src/ty.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,11 +1070,11 @@ pub fn approx_ty_size<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> u64 {
10701070
fn assert_generic_args_match<'tcx>(tcx: TyCtxt<'tcx>, did: DefId, args: &[GenericArg<'tcx>]) {
10711071
let g = tcx.generics_of(did);
10721072
let parent = g.parent.map(|did| tcx.generics_of(did));
1073-
let count = g.parent_count + g.params.len();
1073+
let count = g.parent_count + g.own_params.len();
10741074
let params = parent
1075-
.map_or([].as_slice(), |p| p.params.as_slice())
1075+
.map_or([].as_slice(), |p| p.own_params.as_slice())
10761076
.iter()
1077-
.chain(&g.params)
1077+
.chain(&g.own_params)
10781078
.map(|x| &x.kind);
10791079

10801080
assert!(

clippy_utils/src/ty/type_certainty/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ fn qpath_certainty(cx: &LateContext<'_>, qpath: &QPath<'_>, resolves_to_type: bo
176176
.get(*lang_item)
177177
.map_or(Certainty::Uncertain, |def_id| {
178178
let generics = cx.tcx.generics_of(def_id);
179-
if generics.parent_count == 0 && generics.params.is_empty() {
179+
if generics.parent_count == 0 && generics.own_params.is_empty() {
180180
Certainty::Certain(if resolves_to_type { Some(def_id) } else { None })
181181
} else {
182182
Certainty::Uncertain
@@ -206,7 +206,7 @@ fn path_segment_certainty(
206206
// Checking `res_generics_def_id(..)` before calling `generics_of` avoids an ICE.
207207
if cx.tcx.res_generics_def_id(path_segment.res).is_some() {
208208
let generics = cx.tcx.generics_of(def_id);
209-
let count = generics.params.len() - usize::from(generics.host_effect_index.is_some());
209+
let count = generics.own_params.len() - usize::from(generics.host_effect_index.is_some());
210210
let lhs = if (parent_certainty.is_certain() || generics.parent_count == 0) && count == 0 {
211211
Certainty::Certain(None)
212212
} else {
@@ -299,7 +299,7 @@ fn type_is_inferable_from_arguments(cx: &LateContext<'_>, expr: &Expr<'_>) -> bo
299299
let fn_sig = cx.tcx.fn_sig(callee_def_id).skip_binder();
300300

301301
// Check that all type parameters appear in the functions input types.
302-
(0..(generics.parent_count + generics.params.len()) as u32).all(|index| {
302+
(0..(generics.parent_count + generics.own_params.len()) as u32).all(|index| {
303303
Some(index as usize) == generics.host_effect_index
304304
|| fn_sig
305305
.inputs()

0 commit comments

Comments
 (0)