Auto merge of rust-lang#4297 - matthiaskrgr:rustup_12, r=matthiaskrgr

bors · bors · commit f8e04ff3974f · 2019-07-24T04:56:28.000Z
rustup

changelog: none
diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs
@@ -293,7 +293,7 @@ fn base_local_and_movability<'tcx>(
     let PlaceRef {
         base: place_base,
         mut projection,
-    } = place.as_place_ref();
+    } = place.as_ref();
     if let PlaceBase::Local(local) = place_base {
         while let Some(box Projection { base, elem }) = projection {
             projection = base;
diff --git a/tests/ui/issue-3145.stderr b/tests/ui/issue-3145.stderr
@@ -2,7 +2,7 @@ error: expected token: `,`
   --> $DIR/issue-3145.rs:2:19
    |
 LL |     println!("{}" a); //~ERROR expected token: `,`
-   |                   ^
+   |                   ^ expected `,`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: expected token: `,`
`2`	`2`	`--> $DIR/issue-3145.rs:2:19`
`3`	`3`	`\|`
`4`	`4`	LL \| println!("{}" a); //~ERROR expected token: `,`
`5`		`- \| ^`
	`5`	+ \| ^ expected `,`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`