bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #35319 - Keats:err-137, r=jonathandturner

Browse source 
Update error format for E0137

Fixes #35265 as part of #35233.

r? @jonathandturner
This commit is contained in:
Guillaume Gomez 2016-08-05 16:12:59 +02:00 • committed by GitHub
commit a7b443fd85
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/middle/entry.rs
View file

@ -121,8 +121,11 @@ fn find_item(item: &Item, ctxt: &mut EntryContext, at_root: bool) {
if ctxt.attr_main_fn.is_none() {
ctxt.attr_main_fn = Some((item.id, item.span));
} else {
span_err!(ctxt.session, item.span, E0137,
"multiple functions with a #[main] attribute");
struct_span_err!(ctxt.session, item.span, E0137,
"multiple functions with a #[main] attribute")
.span_label(item.span, &format!("additional #[main] function"))
.span_label(ctxt.attr_main_fn.unwrap().1, &format!("first #[main] function"))
.emit();
}
},
EntryPointType::Start => {

6
src/test/compile-fail/E0137.rs
View file

@ -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