From 101f1e1193624c8a6dc050d294e7ccbd49609bb0 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Thu, 18 Jan 2018 21:24:35 +0530
Subject: [PATCH 1/4] Add regression test for #29723

fixes #29723
---
 src/test/ui/issue-29723.rs     | 25 +++++++++++++++++++++++++
 src/test/ui/issue-29723.stderr | 13 +++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/test/ui/issue-29723.rs
 create mode 100644 src/test/ui/issue-29723.stderr

diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issue-29723.rs
new file mode 100644
index 0000000000000..9f36486e813da
--- /dev/null
+++ b/src/test/ui/issue-29723.rs
@@ -0,0 +1,25 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(nll)]
+
+// test for https://github.com/rust-lang/rust/issues/29723
+
+fn foo() {
+    let s = String::new();
+    let _s = match 0 {
+        0 if { drop(s); false } => String::from("oops"),
+        _ => {
+            // This should trigger an error,
+            // s could have been moved from.
+            s
+        }
+    };
+}
diff --git a/src/test/ui/issue-29723.stderr b/src/test/ui/issue-29723.stderr
new file mode 100644
index 0000000000000..061c3d493238b
--- /dev/null
+++ b/src/test/ui/issue-29723.stderr
@@ -0,0 +1,13 @@
+error[E0382]: use of moved value: `s`
+  --> $DIR/issue-29723.rs:22:13
+   |
+18 |         0 if { drop(s); false } => String::from("oops"),
+   |                     - value moved here
+...
+22 |             s
+   |             ^ value used here after move
+   |
+   = note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait
+
+error: aborting due to previous error
+

From 297595532cbbd79dbb6a90dc400da8e5e0911395 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 19 Jan 2018 08:24:06 -0500
Subject: [PATCH 2/4] s/foo/main/

---
 src/test/ui/issue-29723.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issue-29723.rs
index 9f36486e813da..248e44dcc0233 100644
--- a/src/test/ui/issue-29723.rs
+++ b/src/test/ui/issue-29723.rs
@@ -12,7 +12,7 @@
 
 // test for https://github.com/rust-lang/rust/issues/29723
 
-fn foo() {
+fn main() {
     let s = String::new();
     let _s = match 0 {
         0 if { drop(s); false } => String::from("oops"),

From 9d629c641e3656ee7f84c570703c5e427a166cd0 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 19 Jan 2018 16:45:54 -0500
Subject: [PATCH 3/4] add ERROR annotation

---
 src/test/ui/issue-29723.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issue-29723.rs
index 248e44dcc0233..54785accdb7c0 100644
--- a/src/test/ui/issue-29723.rs
+++ b/src/test/ui/issue-29723.rs
@@ -20,6 +20,7 @@ fn main() {
             // This should trigger an error,
             // s could have been moved from.
             s
+            //~ ERROR use of moved value: `s`
         }
     };
 }

From 67f922bfcceb4219c4c65e1dfaaca9368337f46a Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 19 Jan 2018 16:46:07 -0500
Subject: [PATCH 4/4] fix line

---
 src/test/ui/issue-29723.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issue-29723.rs
index 54785accdb7c0..f31e965ae01c7 100644
--- a/src/test/ui/issue-29723.rs
+++ b/src/test/ui/issue-29723.rs
@@ -20,7 +20,7 @@ fn main() {
             // This should trigger an error,
             // s could have been moved from.
             s
-            //~ ERROR use of moved value: `s`
+            //~^ ERROR use of moved value: `s`
         }
     };
 }