Skip to content

Commit 756b32e

Browse files
committed
Auto merge of #3623 - phansch:rustup, r=flip1995
rustup: rust-lang/rust#55517 None
2 parents 261ebcf + d1fffe0 commit 756b32e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clippy_lints/src/question_mark.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl Pass {
113113
fn moves_by_default(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {
114114
let expr_ty = cx.tables.expr_ty(expression);
115115

116-
expr_ty.moves_by_default(cx.tcx, cx.param_env, expression.span)
116+
!expr_ty.is_copy_modulo_regions(cx.tcx, cx.param_env, expression.span)
117117
}
118118

119119
fn is_option(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {

clippy_lints/src/utils/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ pub fn implements_trait<'a, 'tcx>(
271271
);
272272
cx.tcx
273273
.infer_ctxt()
274-
.enter(|infcx| infcx.predicate_must_hold(&obligation))
274+
.enter(|infcx| infcx.predicate_must_hold_modulo_regions(&obligation))
275275
}
276276

277277
/// Check whether this type implements Drop.
@@ -884,7 +884,7 @@ pub fn type_is_unsafe_function<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx
884884
}
885885

886886
pub fn is_copy<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> bool {
887-
!ty.moves_by_default(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP)
887+
ty.is_copy_modulo_regions(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP)
888888
}
889889

890890
/// Return whether a pattern is refutable.

0 commit comments

Comments
 (0)