From d2e78956c39c1b1e94169f2a1f7cde34aef4ff96 Mon Sep 17 00:00:00 2001
From: Knight <knight42@mail.ustc.edu.cn>
Date: Wed, 17 Aug 2016 00:57:44 +0800
Subject: [PATCH] Updated E0422 to new error message

---
 src/librustc_resolve/lib.rs    | 6 ++++--
 src/test/compile-fail/E0422.rs | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 962509be324..a8b1cb123b8 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -317,11 +317,13 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
             err
         }
         ResolutionError::DoesNotNameAStruct(name) => {
-            struct_span_err!(resolver.session,
+            let mut err = struct_span_err!(resolver.session,
                              span,
                              E0422,
                              "`{}` does not name a structure",
-                             name)
+                             name);
+            err.span_label(span, &format!("not a structure"));
+            err
         }
         ResolutionError::StructVariantUsedAsFunction(path_name) => {
             struct_span_err!(resolver.session,
diff --git a/src/test/compile-fail/E0422.rs b/src/test/compile-fail/E0422.rs
index d1cb7fd9640..61e96b896a6 100644
--- a/src/test/compile-fail/E0422.rs
+++ b/src/test/compile-fail/E0422.rs
@@ -9,5 +9,7 @@
 // except according to those terms.
 
 fn main () {
-    let x = Foo { x: 1, y: 2 }; //~ ERROR E0422
+    let x = Foo { x: 1, y: 2 };
+    //~^ ERROR E0422
+    //~| NOTE not a structure
 }