Apply review suggestions from @y21

2 files changed, 28 insertions, 8 deletions

diff --git a/tests/ui/redundant_locals.rs b/tests/ui/redundant_locals.rs
index 985bc739b26..e81db300f15 100644
--- a/tests/ui/redundant_locals.rs
+++ b/tests/ui/redundant_locals.rs
@@ -124,14 +124,34 @@ impl Drop for WithDrop {
     fn drop(&mut self) {}
 }
 
+struct InnerDrop(WithDrop);
+
+struct ComposeDrop {
+    d: WithDrop,
+}
+
 struct WithoutDrop(usize);
 
 fn drop_trait() {
     let a = WithDrop(1);
     let b = WithDrop(2);
     let a = a;
+}
 
-    let c = WithoutDrop(1);
-    let d = WithoutDrop(2);
-    let c = c;
+fn without_drop() {
+    let a = WithoutDrop(1);
+    let b = WithoutDrop(2);
+    let a = a;
+}
+
+fn drop_inner() {
+    let a = InnerDrop(WithDrop(1));
+    let b = InnerDrop(WithDrop(2));
+    let a = a;
+}
+
+fn drop_compose() {
+    let a = ComposeDrop { d: WithDrop(1) };
+    let b = ComposeDrop { d: WithDrop(1) };
+    let a = a;
 }
diff --git a/tests/ui/redundant_locals.stderr b/tests/ui/redundant_locals.stderr
index 9f8dc6e6162..6e9da8fccbd 100644
--- a/tests/ui/redundant_locals.stderr
+++ b/tests/ui/redundant_locals.stderr
@@ -134,15 +134,15 @@ LL |         let x = x;
    = help: remove the redefinition of `x`
 
 error: redundant redefinition of a binding
-  --> $DIR/redundant_locals.rs:134:9
+  --> $DIR/redundant_locals.rs:142:9
    |
-LL |     let c = WithoutDrop(1);
+LL |     let a = WithoutDrop(1);
    |         ^
-LL |     let d = WithoutDrop(2);
-LL |     let c = c;
+LL |     let b = WithoutDrop(2);
+LL |     let a = a;
    |     ^^^^^^^^^^
    |
-   = help: remove the redefinition of `c`
+   = help: remove the redefinition of `a`
 
 error: aborting due to 14 previous errors