From f656a92cbbd39d62021b692df0e57c6d7a29f2fd Mon Sep 17 00:00:00 2001 From: trixnz Date: Thu, 4 Aug 2016 23:15:58 +0200 Subject: [PATCH 1/2] Update error format for E0130 --- src/librustc_passes/ast_validation.rs | 1 + src/test/compile-fail/E0130.rs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs index 91d2500564fd3..341c9d820e651 100644 --- a/src/librustc_passes/ast_validation.rs +++ b/src/librustc_passes/ast_validation.rs @@ -183,6 +183,7 @@ impl<'a> Visitor for AstValidator<'a> { E0130, "patterns aren't allowed in foreign function \ declarations"); + err.span_label(span, &format!("pattern not allowed in foreign function")); if is_recent { err.span_note(span, "this is a recent error, see issue #35203 for more details"); diff --git a/src/test/compile-fail/E0130.rs b/src/test/compile-fail/E0130.rs index ef5961e133894..e9e027fd1dc19 100644 --- a/src/test/compile-fail/E0130.rs +++ b/src/test/compile-fail/E0130.rs @@ -9,7 +9,9 @@ // except according to those terms. extern { - fn foo((a, b): (u32, u32)); //~ ERROR E0130 + fn foo((a, b): (u32, u32)); + //~^ ERROR E0130 + //~| NOTE pattern not allowed in foreign function } fn main() { From e2cc1571ba5b64223561910ad3be9a4d63552f26 Mon Sep 17 00:00:00 2001 From: trixnz Date: Fri, 5 Aug 2016 12:58:43 +0200 Subject: [PATCH 2/2] Fixed no-pattern-in-args test for new E0130 format --- src/test/compile-fail/no-patterns-in-args.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/compile-fail/no-patterns-in-args.rs b/src/test/compile-fail/no-patterns-in-args.rs index 3edbdf4ebc958..b0278476998dd 100644 --- a/src/test/compile-fail/no-patterns-in-args.rs +++ b/src/test/compile-fail/no-patterns-in-args.rs @@ -10,10 +10,13 @@ extern { fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations - //~^ NOTE this is a recent error + //~^ NOTE pattern not allowed in foreign function + //~| NOTE this is a recent error fn f2(&arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations + //~^ NOTE pattern not allowed in foreign function fn f3(arg @ _: u8); //~ ERROR patterns aren't allowed in foreign function declarations - //~^ NOTE this is a recent error + //~^ NOTE pattern not allowed in foreign function + //~| NOTE this is a recent error fn g1(arg: u8); // OK fn g2(_: u8); // OK // fn g3(u8); // Not yet