Skip to content

Commit cc0607a

Browse files
committed
Add bound_type_of
1 parent cf8ea64 commit cc0607a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clippy_lints/src/eta_reduction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_lint::{LateContext, LateLintPass};
1212
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow};
1313
use rustc_middle::ty::binding::BindingMode;
1414
use rustc_middle::ty::subst::Subst;
15-
use rustc_middle::ty::{self, ClosureKind, EarlyBinder, Ty, TypeFoldable};
15+
use rustc_middle::ty::{self, ClosureKind, Ty, TypeFoldable};
1616
use rustc_session::{declare_lint_pass, declare_tool_lint};
1717
use rustc_span::symbol::sym;
1818

@@ -150,7 +150,7 @@ impl<'tcx> LateLintPass<'tcx> for EtaReduction {
150150
if check_inputs(cx, body.params, args);
151151
let method_def_id = cx.typeck_results().type_dependent_def_id(body.value.hir_id).unwrap();
152152
let substs = cx.typeck_results().node_substs(body.value.hir_id);
153-
let call_ty = EarlyBinder(cx.tcx.type_of(method_def_id)).subst(cx.tcx, substs);
153+
let call_ty = cx.tcx.bound_type_of(method_def_id).subst(cx.tcx, substs);
154154
if check_sig(cx, closure_ty, call_ty);
155155
then {
156156
span_lint_and_then(cx, REDUNDANT_CLOSURE_FOR_METHOD_CALLS, expr.span, "redundant closure", |diag| {

clippy_lints/src/mut_reference.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;
22
use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability};
33
use rustc_lint::{LateContext, LateLintPass};
44
use rustc_middle::ty::subst::Subst;
5-
use rustc_middle::ty::{self, EarlyBinder, Ty};
5+
use rustc_middle::ty::{self, Ty};
66
use rustc_session::{declare_lint_pass, declare_tool_lint};
77
use std::iter;
88

@@ -48,7 +48,7 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryMutPassed {
4848
ExprKind::MethodCall(path, arguments, _) => {
4949
let def_id = cx.typeck_results().type_dependent_def_id(e.hir_id).unwrap();
5050
let substs = cx.typeck_results().node_substs(e.hir_id);
51-
let method_type = EarlyBinder(cx.tcx.type_of(def_id)).subst(cx.tcx, substs);
51+
let method_type = cx.tcx.bound_type_of(def_id).subst(cx.tcx, substs);
5252
check_arguments(cx, arguments, method_type, path.ident.as_str(), "method");
5353
},
5454
_ => (),

clippy_lints/src/transmute/transmute_undefined_repr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use clippy_utils::ty::is_c_void;
44
use rustc_hir::Expr;
55
use rustc_lint::LateContext;
66
use rustc_middle::ty::subst::{Subst, SubstsRef};
7-
use rustc_middle::ty::{self, EarlyBinder, IntTy, Ty, TypeAndMut, UintTy};
7+
use rustc_middle::ty::{self, IntTy, Ty, TypeAndMut, UintTy};
88
use rustc_span::Span;
99

1010
#[allow(clippy::too_many_lines)]
@@ -307,7 +307,7 @@ fn reduce_ty<'tcx>(cx: &LateContext<'tcx>, mut ty: Ty<'tcx>) -> ReducedTy<'tcx>
307307
.non_enum_variant()
308308
.fields
309309
.iter()
310-
.map(|f| EarlyBinder(cx.tcx.type_of(f.did)).subst(cx.tcx, substs));
310+
.map(|f| cx.tcx.bound_type_of(f.did).subst(cx.tcx, substs));
311311
let Some(sized_ty) = iter.find(|&ty| !is_zero_sized_ty(cx, ty)) else {
312312
return ReducedTy::TypeErasure;
313313
};

0 commit comments

Comments
 (0)