nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

librustc: De-@mut DynamicFailureHandler::finished

Browse Source
This commit is contained in:
Patrick Walton 2013-12-22 14:20:56 -08:00
parent fc0b466fd4
commit 4b4ff2cf8b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc/middle/trans/_match.rs
View File

@ -219,6 +219,7 @@ use middle::ty;
use util::common::indenter;
use util::ppaux::{Repr, vec_map_to_str};
use std::cell::Cell;
use std::hashmap::HashMap;
use std::ptr;
use std::vec;
@ -1188,19 +1189,19 @@ struct DynamicFailureHandler {
bcx: @Block,
sp: Span,
msg: @str,
finished: @mut Option<BasicBlockRef>,
finished: @Cell<Option<BasicBlockRef>>,
}
impl CustomFailureHandler for DynamicFailureHandler {
fn handle_fail(&self) -> BasicBlockRef {
match *self.finished {
match self.finished.get() {
Some(bb) => return bb,
_ => (),
}
let fail_cx = sub_block(self.bcx, "case_fallthrough");
controlflow::trans_fail(fail_cx, Some(self.sp), self.msg);
*self.finished = Some(fail_cx.llbb);
self.finished.set(Some(fail_cx.llbb));
fail_cx.llbb
}
}
@ -1911,7 +1912,7 @@ fn trans_match_inner(scope_cx: @Block,
let chk = {
if ty::type_is_empty(tcx, t) {
// Special case for empty types
let fail_cx = @mut None;
let fail_cx = @Cell::new(None);
let fail_handler = @DynamicFailureHandler {
bcx: scope_cx,
sp: discr_expr.span,