Merge pull request #3916 from matthiaskrgr/rustup

flip1995 · web-flow · commit 17e04ac75141 · 2019-04-03T11:43:26.000+02:00
rustup rust-lang/rust#59657
diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs
@@ -299,7 +299,7 @@ fn base_local_and_movability<'tcx>(
                 place = &proj.base;
                 deref = deref || matches!(proj.elem, mir::ProjectionElem::Deref);
                 if !field && matches!(proj.elem, mir::ProjectionElem::Field(..)) {
-                    field = has_drop(cx, place.ty(&mir.local_decls, cx.tcx).to_ty(cx.tcx));
+                    field = has_drop(cx, place.ty(&mir.local_decls, cx.tcx).ty);
                 }
             },
             _ => return None,

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ fn base_local_and_movability<'tcx>(`
`299`	`299`	`place = &proj.base;`
`300`	`300`	`deref = deref \|\| matches!(proj.elem, mir::ProjectionElem::Deref);`
`301`	`301`	`if !field && matches!(proj.elem, mir::ProjectionElem::Field(..)) {`
`302`		`- field = has_drop(cx, place.ty(&mir.local_decls, cx.tcx).to_ty(cx.tcx));`
	`302`	`+ field = has_drop(cx, place.ty(&mir.local_decls, cx.tcx).ty);`
`303`	`303`	`}`
`304`	`304`	`},`
`305`	`305`	`_ => return None,`