Skip to content

Commit 3df37a4

Browse files
committed
update clippy
1 parent 88cf2bf commit 3df37a4

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

src/tools/clippy/clippy_lints/src/await_holding_lock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl LateLintPass<'_, '_> for AwaitHoldingLock {
5959
hir_id: body.value.hir_id,
6060
};
6161
let def_id = cx.tcx.hir().body_owner_def_id(body_id);
62-
let tables = cx.tcx.typeck_tables_of(def_id);
62+
let tables = cx.tcx.typeck_tables_of(cx.tcx.with_opt_param(def_id));
6363
check_interior_types(cx, &tables.generator_interior_types, body.value.span);
6464
}
6565
}

src/tools/clippy/clippy_lints/src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
332332
let result = self
333333
.lcx
334334
.tcx
335-
.const_eval_resolve(self.param_env, def_id, substs, None, None)
335+
.const_eval_resolve(self.param_env, self.lcx.tcx.with_opt_param(def_id), substs, None, None)
336336
.ok()
337337
.map(|val| rustc_middle::ty::Const::from_value(self.lcx.tcx, val, ty))?;
338338
let result = miri_to_const(&result);

src/tools/clippy/clippy_lints/src/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ fn lint_for_missing_headers<'a, 'tcx>(
229229
if let Some(body_id) = body_id;
230230
if let Some(future) = cx.tcx.lang_items().future_trait();
231231
let def_id = cx.tcx.hir().body_owner_def_id(body_id);
232-
let mir = cx.tcx.optimized_mir(def_id.to_def_id());
232+
let mir = cx.tcx.optimized_mir(cx.tcx.with_opt_param(def_id.to_def_id()));
233233
let ret_ty = mir.return_ty();
234234
if implements_trait(cx, ret_ty, future, &[]);
235235
if let ty::Opaque(_, subs) = ret_ty.kind;

src/tools/clippy/clippy_lints/src/fallible_impl_from.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_it
124124
let impl_item_def_id = cx.tcx.hir().local_def_id(impl_item.id.hir_id);
125125
let mut fpu = FindPanicUnwrap {
126126
lcx: cx,
127-
tables: cx.tcx.typeck_tables_of(impl_item_def_id),
127+
tables: cx.tcx.typeck_tables_of(cx.tcx.with_opt_param(impl_item_def_id)),
128128
result: Vec::new(),
129129
};
130130
fpu.visit_expr(&body.value);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ fn is_mutable_pat(cx: &LateContext<'_, '_>, pat: &hir::Pat<'_>, tys: &mut FxHash
497497
if cx.tcx.has_typeck_tables(def_id) {
498498
is_mutable_ty(
499499
cx,
500-
&cx.tcx.typeck_tables_of(def_id.expect_local()).pat_ty(pat),
500+
&cx.tcx.typeck_tables_of(cx.tcx.with_opt_param(def_id.expect_local())).pat_ty(pat),
501501
pat.span,
502502
tys,
503503
)
@@ -617,7 +617,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for StaticMutVisitor<'a, 'tcx> {
617617
if self.cx.tcx.has_typeck_tables(def_id)
618618
&& is_mutable_ty(
619619
self.cx,
620-
self.cx.tcx.typeck_tables_of(def_id.expect_local()).expr_ty(arg),
620+
self.cx.tcx.typeck_tables_of(self.cx.tcx.with_opt_param(def_id.expect_local())).expr_ty(arg),
621621
arg.span,
622622
&mut tys,
623623
)

src/tools/clippy/clippy_lints/src/implicit_return.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImplicitReturn {
139139
return;
140140
}
141141

142-
let mir = cx.tcx.optimized_mir(def_id.to_def_id());
142+
let mir = cx.tcx.optimized_mir(cx.tcx.with_opt_param(def_id.to_def_id()));
143143

144144
// checking return type through MIR, HIR is not able to determine inferred closure return types
145145
// make sure it's not a macro

src/tools/clippy/clippy_lints/src/missing_const_for_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingConstForFn {
116116
FnKind::Closure(..) => return,
117117
}
118118

119-
let mir = cx.tcx.optimized_mir(def_id);
119+
let mir = cx.tcx.optimized_mir(cx.tcx.with_opt_param(def_id.to_def_id()));
120120

121121
if let Err((span, err)) = is_min_const_fn(cx.tcx, def_id.to_def_id(), &mir) {
122122
if rustc_mir::const_eval::is_min_const_fn(cx.tcx, def_id.to_def_id()) {

src/tools/clippy/clippy_lints/src/redundant_clone.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantClone {
8484
return;
8585
}
8686

87-
let mir = cx.tcx.optimized_mir(def_id.to_def_id());
87+
let mir = cx.tcx.optimized_mir(cx.tcx.with_opt_param(def_id.to_def_id()));
8888

8989
let maybe_storage_live_result = MaybeStorageLive
9090
.into_engine(cx.tcx, mir, def_id.to_def_id())

src/tools/clippy/clippy_lints/src/utils/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ pub fn qpath_res(cx: &LateContext<'_, '_>, qpath: &hir::QPath<'_>, id: hir::HirI
291291
hir::QPath::TypeRelative(..) => {
292292
if cx.tcx.has_typeck_tables(id.owner.to_def_id()) {
293293
cx.tcx
294-
.typeck_tables_of(id.owner.to_def_id().expect_local())
294+
.typeck_tables_of(cx.tcx.with_opt_param(id.owner))
295295
.qpath_res(qpath, id)
296296
} else {
297297
Res::Err

0 commit comments

Comments
 (0)