about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorKnight <knight42@mail.ustc.edu.cn>2016-08-17 00:57:44 +0800
committerKnight <knight42@mail.ustc.edu.cn>2016-08-17 03:02:25 +0800
commitd2e78956c39c1b1e94169f2a1f7cde34aef4ff96 (patch)
treea821b9df76a2e9a8d3c7e90c9335fdea95f7d4c7 /src
parente25542cb02d946959517ebb68e2f7b1318817237 (diff)
downloadrust-d2e78956c39c1b1e94169f2a1f7cde34aef4ff96.tar.gz
rust-d2e78956c39c1b1e94169f2a1f7cde34aef4ff96.zip
Updated E0422 to new error message
Diffstat (limited to 'src')
-rw-r--r--src/librustc_resolve/lib.rs6
-rw-r--r--src/test/compile-fail/E0422.rs4
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
 }