squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

syntax: Add diagnostic::expect

Browse source
This commit is contained in:
Brian Anderson 2012-05-22 14:55:39 -07:00
parent a32392d032
commit 99c1b2953d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/librustsyntax/diagnostic.rs
View file

@ -7,6 +7,7 @@ export level, fatal, error, warning, note;
export span_handler, handler, mk_span_handler, mk_handler;
export codemap_span_handler, codemap_handler;
export ice_msg;
export expect;
type emitter = fn@(cmsp: option<(codemap::codemap, span)>,
msg: str, lvl: level);
@ -253,3 +254,11 @@ fn print_macro_backtrace(cm: codemap::codemap, sp: span) {
print_macro_backtrace(cm, ei.call_site);
}
}
fn expect<T: copy>(diag: span_handler,
opt: option<T>, msg: fn() -> str) -> T {
alt opt {
some(t) { t }
none { diag.handler().bug(msg()); }
}
}

5
src/rustc/driver/session.rs
View file

@ -171,10 +171,7 @@ fn basic_options() -> @options {
// Seems out of place, but it uses session, so I'm putting it here
fn expect<T: copy>(sess: session, opt: option<T>, msg: fn() -> str) -> T {
alt opt {
some(t) { t }
none { sess.bug(msg()); }
}
diagnostic::expect(sess.diagnostic(), opt, msg)
}
fn building_library(req_crate_type: crate_type, crate: @ast::crate,