Skip to content

Commit eb7a0f8

Browse files
Use correct param env in clippy
1 parent ab7d207 commit eb7a0f8

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/tools/clippy/clippy_lints/src/default.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl<'tcx> LateLintPass<'tcx> for Default {
131131
// only when assigning `... = Default::default()`
132132
&& is_expr_default(expr, cx)
133133
&& let binding_type = cx.typeck_results().node_type(binding_id)
134-
&& let Some(adt) = binding_type.ty_adt_def()
134+
&& let ty::Adt(adt, args) = *binding_type.kind()
135135
&& adt.is_struct()
136136
&& let variant = adt.non_enum_variant()
137137
&& (adt.did().is_local() || !variant.is_field_list_non_exhaustive())
@@ -144,7 +144,7 @@ impl<'tcx> LateLintPass<'tcx> for Default {
144144
.fields
145145
.iter()
146146
.all(|field| {
147-
is_copy(cx, cx.tcx.type_of(field.did).instantiate_identity())
147+
is_copy(cx, cx.tcx.type_of(field.did).instantiate(cx.tcx, args))
148148
})
149149
&& (!has_drop(cx, binding_type) || all_fields_are_copy)
150150
{

src/tools/clippy/clippy_lints/src/useless_conversion.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ fn into_iter_bound<'tcx>(
8686
param_index: u32,
8787
node_args: GenericArgsRef<'tcx>,
8888
) -> Option<Span> {
89-
let param_env = cx.tcx.param_env(fn_did);
9089
let mut into_iter_span = None;
9190

9291
for (pred, span) in cx.tcx.explicit_predicates_of(fn_did).predicates {
@@ -111,7 +110,7 @@ fn into_iter_bound<'tcx>(
111110
}));
112111

113112
let predicate = EarlyBinder::bind(tr).instantiate(cx.tcx, args);
114-
let obligation = Obligation::new(cx.tcx, ObligationCause::dummy(), param_env, predicate);
113+
let obligation = Obligation::new(cx.tcx, ObligationCause::dummy(), cx.param_env, predicate);
115114
if !cx
116115
.tcx
117116
.infer_ctxt()

0 commit comments

Comments
 (0)