From 7a884f9561ef971003c62339202b41f804860f2d Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 22 Apr 2020 15:12:53 +0200 Subject: [PATCH] ui: Acknowledge added and changed compiler output about errors in macros Recent Rust versions give "this error originates in a macro" more frequently, and on one occasion removed the "outside of the current crate" remark. This acknowledges the change in the stderr of the test cases, given the information makes sense and does not deteriorate user experience. --- ui/cases/expected-token.stderr | 2 ++ ui/cases/not-enough-children.stderr | 2 ++ ui/cases/tag-mismatch.stderr | 4 ++++ ui/cases/text-nodes-need-to-be-quoted.stderr | 4 ++++ ui/cases/unexpected-end-of-macro.stderr | 2 +- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/cases/expected-token.stderr b/ui/cases/expected-token.stderr index 689e13f..a9eb638 100644 --- a/ui/cases/expected-token.stderr +++ b/ui/cases/expected-token.stderr @@ -3,6 +3,8 @@ error: expected identifier | 10 | <@> | ^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/ui/cases/not-enough-children.stderr b/ui/cases/not-enough-children.stderr index a47d96f..4f8b2f7 100644 --- a/ui/cases/not-enough-children.stderr +++ b/ui/cases/not-enough-children.stderr @@ -3,6 +3,8 @@ error: requires 2 children but there are only 1 | 10 | | ^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/ui/cases/tag-mismatch.stderr b/ui/cases/tag-mismatch.stderr index e406a4b..f14635c 100644 --- a/ui/cases/tag-mismatch.stderr +++ b/ui/cases/tag-mismatch.stderr @@ -3,12 +3,16 @@ error: expected closing tag '', found '' | 10 | | ^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: unclosed tag --> $DIR/tag-mismatch.rs:10:10 | 10 | | ^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/ui/cases/text-nodes-need-to-be-quoted.stderr b/ui/cases/text-nodes-need-to-be-quoted.stderr index 166f79e..9a2ed32 100644 --- a/ui/cases/text-nodes-need-to-be-quoted.stderr +++ b/ui/cases/text-nodes-need-to-be-quoted.stderr @@ -3,12 +3,16 @@ error: expected "<", code block or literal | 10 | unquoted | ^^^^^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: text nodes need to be quoted, eg. 

"Hello Joe!"

 --> $DIR/text-nodes-need-to-be-quoted.rs:10:16 | 10 | unquoted | ^^^^^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/ui/cases/unexpected-end-of-macro.stderr b/ui/cases/unexpected-end-of-macro.stderr index a7a6e33..84db8fe 100644 --- a/ui/cases/unexpected-end-of-macro.stderr +++ b/ui/cases/unexpected-end-of-macro.stderr @@ -7,7 +7,7 @@ error: unexpected end of macro; missing "<", code block or literal 11 | | }; | |_____^ | - = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to previous error