about summary refs log tree commit diff
path: root/src/librustc_errors
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-09-24 00:15:44 +0200
committerGitHub <noreply@github.com>2016-09-24 00:15:44 +0200
commitf17bdb7eecfe6fa0863c71acd8f0590dbf03dcce (patch)
tree23cfbd4e8597116e1f7313c36819ea5f2184f9dc /src/librustc_errors
parentf45283b93e04fe8bfab8c6dfd7121ad17d524bec (diff)
parentd7428944c20ab212a05d4e855fd233ed7e09e4a9 (diff)
downloadrust-f17bdb7eecfe6fa0863c71acd8f0590dbf03dcce.tar.gz
rust-f17bdb7eecfe6fa0863c71acd8f0590dbf03dcce.zip
Rollup merge of #36498 - jonathandturner:macro_std_lib, r=nikomatsakis
Fix wording for out-of-crate macro error

This fixes the wording of the note for out-of-crate macro errors to fix https://github.com/rust-lang/rust/issues/36469

The previous wording came from older logic in the PR that was replaced without updating the note.
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/emitter.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 1bdc9ef3088..6456b72dfb5 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -473,7 +473,8 @@ impl EmitterWriter {
         if spans_updated {
             children.push(SubDiagnostic {
                 level: Level::Note,
-                message: "this error originates in a macro from the standard library".to_string(),
+                message:"this error originates in a macro outside of the current \
+                         crate".to_string(),
                 span: MultiSpan::new(),
                 render_span: None
             });