OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Fix the logic for finding the Android main function

Browse Source 
I don't understand what this logic is doing
This commit is contained in:
Brian Anderson 2013-05-06 18:48:24 -07:00
parent 98f5c6d5b6
commit 3970d02ec5
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/librustc/middle/entry.rs
View File

@ -42,8 +42,8 @@ type EntryVisitor = vt<@mut EntryContext>;
pub fn find_entry_point(session: Session, crate: @crate, ast_map: ast_map::map) {
// FIXME #4404 android JNI hacks
if *session.building_library ||
session.targ_cfg.os == session::os_android {
if *session.building_library &&
session.targ_cfg.os != session::os_android {
// No need to find a main function
return;
}
@ -127,18 +127,24 @@ fn configure_main(ctxt: @mut EntryContext) {
*this.session.entry_fn = this.main_fn;
*this.session.entry_type = Some(session::EntryMain);
} else {
// No main function
this.session.err(~"main function not found");
if !this.non_main_fns.is_empty() {
// There were some functions named 'main' though. Try to give the user a hint.
this.session.note(~"the main function must be defined at the crate level \
but you have one or more functions named 'main' that are not \
defined at the crate level. Either move the definition or attach \
the `#[main]` attribute to override this behavior.");
for this.non_main_fns.each |&(_, span)| {
this.session.span_note(span, ~"here is a function named 'main'");
if !*this.session.building_library {
// No main function
this.session.err(~"main function not found");
if !this.non_main_fns.is_empty() {
// There were some functions named 'main' though. Try to give the user a hint.
this.session.note(~"the main function must be defined at the crate level \
but you have one or more functions named 'main' that are not \
defined at the crate level. Either move the definition or \
attach the `#[main]` attribute to override this behavior.");
for this.non_main_fns.each |&(_, span)| {
this.session.span_note(span, ~"here is a function named 'main'");
}
}
this.session.abort_if_errors();
} else {
// If we *are* building a library, then we're on android where we still might
// optionally want to translate main $4404
assert!(this.session.targ_cfg.os == session::os_android);
}
this.session.abort_if_errors();
}
}

2
src/test/compile-fail/issue-2995.rs
View File

@ -11,3 +11,5 @@
fn bad (p: *int) {
let _q: &int = p as &int; //~ ERROR non-scalar cast
}
fn main() { }

2
src/test/compile-fail/tag-variant-disr-dup.rs
View File

@ -19,3 +19,5 @@ enum color {
black = 0x000000,
white = 0x000000,
}
fn main() { }