mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #3623 - phansch:rustup, r=flip1995

Browse Source 
rustup: https://github.com/rust-lang/rust/pull/55517

None
This commit is contained in:
bors 2019-01-03 22:29:09 +00:00
commit 756b32e1e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/question_mark.rs
View File

@ -113,7 +113,7 @@ impl Pass {
fn moves_by_default(cx: &LateContext<'_, '_>, expression: &Expr) -> bool { fn moves_by_default(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {
let expr_ty = cx.tables.expr_ty(expression); let expr_ty = cx.tables.expr_ty(expression);
expr_ty.moves_by_default(cx.tcx, cx.param_env, expression.span) !expr_ty.is_copy_modulo_regions(cx.tcx, cx.param_env, expression.span)
} }
fn is_option(cx: &LateContext<'_, '_>, expression: &Expr) -> bool { fn is_option(cx: &LateContext<'_, '_>, expression: &Expr) -> bool {

4
clippy_lints/src/utils/mod.rs
View File

@ -271,7 +271,7 @@ pub fn implements_trait<'a, 'tcx>(
); );
cx.tcx cx.tcx
.infer_ctxt() .infer_ctxt()
.enter(|infcx| infcx.predicate_must_hold(&obligation)) .enter(|infcx| infcx.predicate_must_hold_modulo_regions(&obligation))
} }
/// Check whether this type implements Drop. /// 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
} }
pub fn is_copy<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> bool { pub fn is_copy<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> bool {
!ty.moves_by_default(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP) ty.is_copy_modulo_regions(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP)
} }
/// Return whether a pattern is refutable. /// Return whether a pattern is refutable.