about summary refs log tree commit diff
path: root/src/test/compile-fail
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-08-17 06:25:27 -0700
committerGitHub <noreply@github.com>2016-08-17 06:25:27 -0700
commit5fc58dcaff19ff142d4b0ecc35278b18d03c8ace (patch)
treece6a846dc34be22a55a73e621096df5cf9ea19b9 /src/test/compile-fail
parent75454f72a315d0868263db346ec779367fcdbbff (diff)
parent3caa451b9db58836301dd93ffabc0fb493dd4fe7 (diff)
downloadrust-5fc58dcaff19ff142d4b0ecc35278b18d03c8ace.tar.gz
rust-5fc58dcaff19ff142d4b0ecc35278b18d03c8ace.zip
Rollup merge of #35722 - knight42:update-error-msg, r=jonathandturner
Updated E0394 & E0422 to new format

Fixes #35692 and #35700, as part of #35233.

r? @jonathandturner
Diffstat (limited to 'src/test/compile-fail')
-rw-r--r--src/test/compile-fail/E0394.rs5
-rw-r--r--src/test/compile-fail/E0422.rs4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/test/compile-fail/E0394.rs b/src/test/compile-fail/E0394.rs
index 1b86b8ad674..e35d038248c 100644
--- a/src/test/compile-fail/E0394.rs
+++ b/src/test/compile-fail/E0394.rs
@@ -9,7 +9,10 @@
 // except according to those terms.
 
 static A: u32 = 0;
-static B: u32 = A; //~ ERROR E0394
+static B: u32 = A;
+//~^ ERROR E0394
+//~| NOTE referring to another static by value
+//~| NOTE use the address-of operator or a constant instead
 
 fn main() {
 }
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
 }