about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-03-31 16:10:38 +0200
committerGitHub <noreply@github.com>2019-03-31 16:10:38 +0200
commitfb8396da843fd665fc73a0bf448d5fb83b1b978b (patch)
tree8454df10ef33efa7dbef5bae1de8b23586d57e59 /src/test/ui
parent61222b5731a733628555a7f6eabc9ff93bd2437f (diff)
parent45c82abf13385f22d10dccecd1e54b28cfbeb5cc (diff)
downloadrust-fb8396da843fd665fc73a0bf448d5fb83b1b978b.tar.gz
rust-fb8396da843fd665fc73a0bf448d5fb83b1b978b.zip
Rollup merge of #59574 - JohnTitor:distinguish-error-vs-warning, r=Centril
Distinguish message for external macros depending on error level

fixes #57716

(I picked you because assigned to this issue.)
r? @estebank
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/imports/import-crate-var.stderr2
-rw-r--r--src/test/ui/macros/must-use-in-macro-55516.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/imports/import-crate-var.stderr b/src/test/ui/imports/import-crate-var.stderr
index 928256543bc..4c358a81cc1 100644
--- a/src/test/ui/imports/import-crate-var.stderr
+++ b/src/test/ui/imports/import-crate-var.stderr
@@ -5,5 +5,5 @@ LL |     m!();
    |     ^^^^^
    |
    = note: `use $crate;` was erroneously allowed and will become a hard error in a future release
-   = 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 warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
diff --git a/src/test/ui/macros/must-use-in-macro-55516.stderr b/src/test/ui/macros/must-use-in-macro-55516.stderr
index 623b5745a35..302c8aa7e6a 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.stderr
+++ b/src/test/ui/macros/must-use-in-macro-55516.stderr
@@ -6,5 +6,5 @@ LL |     write!(&mut example, "{}", 42);
    |
    = note: `-W unused-must-use` implied by `-W unused`
    = note: this `Result` may be an `Err` variant, which should be handled
-   = 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 warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)