squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #4153 - matthiaskrgr:rustup_5, r=flip1995

Browse source 
rustup https://github.com/rust-lang/rust/pull/60928

changelog: none
This commit is contained in:
bors 2019-05-29 20:01:57 +00:00
commit 018fa30c56
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clippy_lints/src/redundant_clone.rs
View file

@ -212,7 +212,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantClone {
/// If `kind` is `y = func(x: &T)` where `T: !Copy`, returns `(DefId of func, x, T, y)`. /// If `kind` is `y = func(x: &T)` where `T: !Copy`, returns `(DefId of func, x, T, y)`.
fn is_call_with_ref_arg<'tcx>( fn is_call_with_ref_arg<'tcx>(
cx: &LateContext<'_, 'tcx>, cx: &LateContext<'_, 'tcx>,
mir: &'tcx mir::Mir<'tcx>, mir: &'tcx mir::Body<'tcx>,
kind: &'tcx mir::TerminatorKind<'tcx>, kind: &'tcx mir::TerminatorKind<'tcx>,
) -> Option<(def_id::DefId, mir::Local, Ty<'tcx>, Option<&'tcx mir::Place<'tcx>>)> { ) -> Option<(def_id::DefId, mir::Local, Ty<'tcx>, Option<&'tcx mir::Place<'tcx>>)> {
if_chain! { if_chain! {
@ -236,7 +236,7 @@ type CannotMoveOut = bool;
/// ``Some((from, [`true` if `from` cannot be moved out]))``. /// ``Some((from, [`true` if `from` cannot be moved out]))``.
fn find_stmt_assigns_to<'a, 'tcx: 'a>( fn find_stmt_assigns_to<'a, 'tcx: 'a>(
cx: &LateContext<'_, 'tcx>, cx: &LateContext<'_, 'tcx>,
mir: &mir::Mir<'tcx>, mir: &mir::Body<'tcx>,
to: mir::Local, to: mir::Local,
by_ref: bool, by_ref: bool,
stmts: impl DoubleEndedIterator<Item = &'a mir::Statement<'tcx>>, stmts: impl DoubleEndedIterator<Item = &'a mir::Statement<'tcx>>,
@ -270,7 +270,7 @@ fn find_stmt_assigns_to<'a, 'tcx: 'a>(
/// Also reports whether given `place` cannot be moved out. /// Also reports whether given `place` cannot be moved out.
fn base_local_and_movability<'tcx>( fn base_local_and_movability<'tcx>(
cx: &LateContext<'_, 'tcx>, cx: &LateContext<'_, 'tcx>,
mir: &mir::Mir<'tcx>, mir: &mir::Body<'tcx>,
mut place: &mir::Place<'tcx>, mut place: &mir::Place<'tcx>,
) -> Option<(mir::Local, CannotMoveOut)> { ) -> Option<(mir::Local, CannotMoveOut)> {
use rustc::mir::Place::*; use rustc::mir::Place::*;