about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-08-05 16:12:59 +0200
committerGitHub <noreply@github.com>2016-08-05 16:12:59 +0200
commita7b443fd85db4b47dc3399ba6f47db68e87f00f7 (patch)
treedc355c68322bf68c00d528e4d98667eda3b81b1f /src/test
parente9b79d918cb8f45f3ebfd71c55840e2f28e1ed59 (diff)
parentdf726a45e18a9e760931f867b995f642131180ad (diff)
downloadrust-a7b443fd85db4b47dc3399ba6f47db68e87f00f7.tar.gz
rust-a7b443fd85db4b47dc3399ba6f47db68e87f00f7.zip
Rollup merge of #35319 - Keats:err-137, r=jonathandturner
Update error format for E0137

Fixes #35265 as part of #35233.

r? @jonathandturner
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/E0137.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/compile-fail/E0137.rs b/src/test/compile-fail/E0137.rs
index 695ce7995a9..f45afc9f37b 100644
--- a/src/test/compile-fail/E0137.rs
+++ b/src/test/compile-fail/E0137.rs
@@ -11,7 +11,9 @@
 #![feature(main)]
 
 #[main]
-fn foo() {}
+fn foo() {} //~ NOTE first #[main] function
 
 #[main]
-fn f() {} //~ ERROR E0137
+fn f() {}
+//~^ ERROR E0137
+//~| NOTE additional #[main] function