user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: Convert to pipes

Browse source
This commit is contained in:
Brian Anderson 2013-01-30 01:52:01 -08:00
parent 02e907b648
commit 7ad0716275
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/librustc/rustc.rc
View file

@ -357,24 +357,27 @@ fails without recording a fatal error then we've encountered a compiler
bug and need to present an error.
*/
pub fn monitor(+f: fn~(diagnostic::emitter)) {
let p = oldcomm::Port();
let ch = oldcomm::Chan(&p);
use core::pipes::*;
use std::cell::Cell;
let (p, ch) = stream();
let ch = SharedChan(ch);
let ch_capture = ch.clone();
match do task::try |move f| {
let ch = ch_capture.clone();
let ch_capture = ch.clone();
// The 'diagnostics emitter'. Every error, warning, etc. should
// go through this function.
let demitter = fn@(cmsp: Option<(@codemap::CodeMap, codemap::span)>,
msg: &str, lvl: diagnostic::level) {
if lvl == diagnostic::fatal {
oldcomm::send(ch, fatal);
ch_capture.send(fatal);
}
diagnostic::emit(cmsp, msg, lvl);
};
struct finally {
ch: oldcomm::Chan<monitor_msg>,
drop { oldcomm::send(self.ch, done); }
ch: SharedChan<monitor_msg>,
drop { self.ch.send(done); }
}
let _finally = finally { ch: ch };
@ -384,7 +387,7 @@ pub fn monitor(+f: fn~(diagnostic::emitter)) {
result::Ok(_) => { /* fallthrough */ }
result::Err(_) => {
// Task failed without emitting a fatal diagnostic
if oldcomm::recv(p) == done {
if p.recv() == done {
diagnostic::emit(
None,
diagnostic::ice_msg(~"unexpected failure"),