about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-07-24 04:56:28 +0000
committerbors <bors@rust-lang.org>2019-07-24 04:56:28 +0000
commitf8e04ff3974f62997a7b73c2f39b726202b5a0dd (patch)
tree1bb0459dff43bbe0feda3ff88a6ff41aaa64ec67
parentd71e9c4f10da31bbdefa4dad64b1f38a456c89ce (diff)
parentb0373a5f6b6d4aa61c4ef9322a7b34c6b7507934 (diff)
downloadrust-f8e04ff3974f62997a7b73c2f39b726202b5a0dd.tar.gz
rust-f8e04ff3974f62997a7b73c2f39b726202b5a0dd.zip
Auto merge of #4297 - matthiaskrgr:rustup_12, r=matthiaskrgr
rustup

changelog: none
-rw-r--r--clippy_lints/src/redundant_clone.rs2
-rw-r--r--tests/ui/issue-3145.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs
index d24a20b079d..e8553861597 100644
--- 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
index f3984f991a4..cb0d95f5e26 100644
--- 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