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

rustup changelog: none
matthiaskrgr · Jul 24, 2019 · f8e04ff · f8e04ff
2 parents d71e9c4 + b0373a5
commit f8e04ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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