summary refs log tree commit diff
path: root/src/librustc_errors
diff options
context:
space:
mode:
authorJonathan Turner <jturner@mozilla.com>2016-08-19 16:05:37 -0700
committerJonathan Turner <jturner@mozilla.com>2016-08-19 16:05:37 -0700
commit54d0acd2fc6414930ff27c01c8640f4e9c666ad5 (patch)
treea3911442682c1c5a86b9dd4dfb8e7bb97825dfda /src/librustc_errors
parent413ada30402f823a86a75578afc63d07179f6a23 (diff)
downloadrust-54d0acd2fc6414930ff27c01c8640f4e9c666ad5.tar.gz
rust-54d0acd2fc6414930ff27c01c8640f4e9c666ad5.zip
wording fixes in error messages
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/emitter.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 5fd9226aba9..793155cfa8f 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -426,7 +426,9 @@ impl EmitterWriter {
                             continue;
                         }
                         // Check to make sure we're not in any <*macros>
-                        if !cm.span_to_filename(def_site).contains("macros>") {
+                        if !cm.span_to_filename(def_site).contains("macros>") &&
+                            !trace.macro_decl_name.starts_with("#[")
+                        {
                             new_labels.push((trace.call_site,
                                              "in this macro invocation".to_string()));
                             break;