about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-08-24 10:35:29 -0700
committerGitHub <noreply@github.com>2016-08-24 10:35:29 -0700
commit2932db19b535a851a42e4c20ca2d901aff2b612f (patch)
treeb6cf9531beacc1a9d6627b0e68ddf78c34a8dd89 /src/test
parent411a85e2717ddd016fa4a3fbf5df5231018616ec (diff)
parent11e9b8de7db8d5500cbee2252f6afd870f186104 (diff)
downloadrust-2932db19b535a851a42e4c20ca2d901aff2b612f.tar.gz
rust-2932db19b535a851a42e4c20ca2d901aff2b612f.zip
Rollup merge of #35961 - 0xmohit:pr/error-codes-E0445-E0454, r=GuillaumeGomez
Update E0445 and E0454 to new error format

Fixes #35922.
Fixes #35930.
Part of #35233.

r? @GuillaumeGomez
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/E0445.rs12
-rw-r--r--src/test/compile-fail/E0454.rs4
2 files changed, 12 insertions, 4 deletions
diff --git a/src/test/compile-fail/E0445.rs b/src/test/compile-fail/E0445.rs
index 6b360c60a0f..7c5c862a6f8 100644
--- a/src/test/compile-fail/E0445.rs
+++ b/src/test/compile-fail/E0445.rs
@@ -12,8 +12,14 @@ trait Foo {
     fn dummy(&self) { }
 }
 
-pub trait Bar : Foo {} //~ ERROR E0445
-pub struct Bar2<T: Foo>(pub T); //~ ERROR E0445
-pub fn foo<T: Foo> (t: T) {} //~ ERROR E0445
+pub trait Bar : Foo {}
+//~^ ERROR private trait in public interface [E0445]
+//~| NOTE private trait can't be public
+pub struct Bar2<T: Foo>(pub T);
+//~^ ERROR private trait in public interface [E0445]
+//~| NOTE private trait can't be public
+pub fn foo<T: Foo> (t: T) {}
+//~^ ERROR private trait in public interface [E0445]
+//~| NOTE private trait can't be public
 
 fn main() {}
diff --git a/src/test/compile-fail/E0454.rs b/src/test/compile-fail/E0454.rs
index 1439c3133d9..39887927c88 100644
--- a/src/test/compile-fail/E0454.rs
+++ b/src/test/compile-fail/E0454.rs
@@ -8,7 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[link(name = "")] extern {} //~ ERROR E0454
+#[link(name = "")] extern {}
+//~^ ERROR E0454
+//~| NOTE empty name given
 
 fn main() {
 }