From 69e6dc0444bb62a474c8c5f7490c660f9d88c172 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Thu, 16 Jul 2015 17:19:08 +0530
Subject: [PATCH] Fix diagnostics name clash

---
 src/librustc_typeck/check/mod.rs   | 2 +-
 src/librustc_typeck/diagnostics.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index a2fee0916894..9042cedccc85 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -3427,7 +3427,7 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
         let struct_id = match def {
             def::DefVariant(enum_id, variant_id, true) => {
                 if let &Some(ref base_expr) = base_expr {
-                    span_err!(tcx.sess, base_expr.span, E0401,
+                    span_err!(tcx.sess, base_expr.span, E0436,
                               "functional record update syntax requires a struct");
                     fcx.write_error(base_expr.id);
                 }
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 636a8aeb544e..2069e3098e63 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -2211,5 +2211,5 @@ register_diagnostics! {
            // type because its default value `{}` references the type `Self`"
     E0399, // trait items need to be implemented because the associated
            // type `{}` was overridden
-    E0401  // functional record update requires a struct
+    E0436  // functional record update requires a struct
 }