From 23c7e6658918a810afd3854d7f25949a9f68a0f2 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Mon, 30 Nov 2015 19:56:19 +0300
Subject: [PATCH] Fix regression in patterns with empty variants

---
 src/librustc_typeck/check/_match.rs |  5 ++++-
 src/test/run-pass/issue-pr29383.rs  | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 src/test/run-pass/issue-pr29383.rs

diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
index 1053919be53fe..1a3812147d898 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/src/librustc_typeck/check/_match.rs
@@ -636,8 +636,11 @@ pub fn check_pat_enum<'a, 'tcx>(pcx: &pat_ctxt<'a, 'tcx>,
 
     let report_bad_struct_kind = |is_warning| {
         bad_struct_kind_err(tcx.sess, pat.span, path, is_warning);
-        fcx.write_error(pat.id);
+        if is_warning {
+            return
+        }
 
+        fcx.write_error(pat.id);
         if let Some(subpats) = subpats {
             for pat in subpats {
                 check_pat(pcx, &**pat, tcx.types.err);
diff --git a/src/test/run-pass/issue-pr29383.rs b/src/test/run-pass/issue-pr29383.rs
new file mode 100644
index 0000000000000..487dbdd33c98e
--- /dev/null
+++ b/src/test/run-pass/issue-pr29383.rs
@@ -0,0 +1,22 @@
+// Copyright 2015 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.
+
+enum E {
+    A,
+    B,
+}
+
+fn main() {
+    match None {
+        None => {}
+        Some(E::A(..)) => {}
+        Some(E::B(..)) => {}
+    }
+}