Skip to content

Commit 71ec4ff

Browse files
authored
Merge pull request rust-lang#3404 from matthiaskrgr/rustup
rustup rust-lang/rust#55330
2 parents 486300b + b59b60c commit 71ec4ff

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clippy_lints/src/map_unit_fn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn is_unit_function(cx: &LateContext<'_, '_>, expr: &hir::Expr) -> bool {
106106
let ty = cx.tables.expr_ty(expr);
107107

108108
if let ty::FnDef(id, _) = ty.sty {
109-
if let Some(fn_type) = cx.tcx.fn_sig(id).no_late_bound_regions() {
109+
if let Some(fn_type) = cx.tcx.fn_sig(id).no_bound_vars() {
110110
return is_unit_type(fn_type.output());
111111
}
112112
}

clippy_lints/src/needless_pass_by_value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
125125
.filter(|p| !p.is_global())
126126
.filter_map(|pred| {
127127
if let ty::Predicate::Trait(poly_trait_ref) = pred {
128-
if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_regions() {
128+
if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_bound_vars() {
129129
return None;
130130
}
131131
Some(poly_trait_ref)

0 commit comments

Comments
 (0)