@@ -41,7 +41,7 @@ enum opt_result {
41
41
range_result( result , result ) ,
42
42
}
43
43
fn trans_opt ( bcx : block , o : opt ) -> opt_result {
44
- let _icx = bcx. insn_ctxt ( ~ "alt:: trans_opt") ;
44
+ let _icx = bcx. insn_ctxt ( "alt::trans_opt" ) ;
45
45
let ccx = bcx. ccx ( ) ;
46
46
let mut bcx = bcx;
47
47
match o {
@@ -303,7 +303,7 @@ fn get_options(ccx: @crate_ctxt, m: match_, col: uint) -> ~[opt] {
303
303
fn extract_variant_args ( bcx : block , pat_id : ast:: node_id ,
304
304
vdefs : { enm : def_id , var : def_id } , val : ValueRef ) ->
305
305
{ vals : ~[ ValueRef ] , bcx : block} {
306
- let _icx = bcx. insn_ctxt ( ~ "alt:: extract_variant_args") ;
306
+ let _icx = bcx. insn_ctxt ( "alt::extract_variant_args" ) ;
307
307
let ccx = bcx. fcx . ccx ;
308
308
let enum_ty_substs = match check ty:: get ( node_id_type ( bcx, pat_id) )
309
309
. struct {
@@ -449,7 +449,7 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
449
449
For an empty match, a fall-through case must exist
450
450
*/
451
451
assert ( m. len ( ) > 0 u || is_some ( chk) ) ;
452
- let _icx = bcx. insn_ctxt ( ~ "alt:: compile_submatch") ;
452
+ let _icx = bcx. insn_ctxt ( "alt::compile_submatch" ) ;
453
453
let mut bcx = bcx;
454
454
let tcx = bcx. tcx ( ) , dm = tcx. def_map ;
455
455
if m. len ( ) == 0 u { Br ( bcx, option:: get ( chk) ( ) ) ; return ; }
@@ -735,7 +735,7 @@ fn make_phi_bindings(bcx: block,
735
735
map : ~[ exit_node ] ,
736
736
ids : pat_util:: pat_id_map )
737
737
-> option < phi_bindings_list > {
738
- let _icx = bcx. insn_ctxt ( ~ "alt:: make_phi_bindings") ;
738
+ let _icx = bcx. insn_ctxt ( "alt::make_phi_bindings" ) ;
739
739
let our_block = bcx. llbb as uint ;
740
740
let mut phi_bindings = ~[ ] ;
741
741
for ids. each |name, node_id| {
@@ -815,15 +815,15 @@ fn trans_alt(bcx: block,
815
815
arms : ~[ ast:: arm ] ,
816
816
mode : ast:: alt_mode ,
817
817
dest : dest ) -> block {
818
- let _icx = bcx. insn_ctxt ( ~ "alt:: trans_alt") ;
818
+ let _icx = bcx. insn_ctxt ( "alt::trans_alt" ) ;
819
819
do with_scope( bcx, alt_expr. info ( ) , ~"alt") |bcx| {
820
820
trans_alt_inner ( bcx, expr, arms, mode, dest)
821
821
}
822
822
}
823
823
824
824
fn trans_alt_inner ( scope_cx : block , expr : @ast:: expr , arms : ~[ ast:: arm ] ,
825
825
mode : ast:: alt_mode , dest : dest ) -> block {
826
- let _icx = scope_cx. insn_ctxt ( ~ "alt:: trans_alt_inner") ;
826
+ let _icx = scope_cx. insn_ctxt ( "alt::trans_alt_inner" ) ;
827
827
let bcx = scope_cx, tcx = bcx. tcx ( ) ;
828
828
let mut bodies = ~[ ] , matches = ~[ ] ;
829
829
@@ -897,7 +897,7 @@ fn trans_alt_inner(scope_cx: block, expr: @ast::expr, arms: ~[ast::arm],
897
897
// Not alt-related, but similar to the pattern-munging code above
898
898
fn bind_irrefutable_pat ( bcx : block , pat : @ast:: pat , val : ValueRef ,
899
899
make_copy : bool ) -> block {
900
- let _icx = bcx. insn_ctxt ( ~ "alt:: bind_irrefutable_pat") ;
900
+ let _icx = bcx. insn_ctxt ( "alt::bind_irrefutable_pat" ) ;
901
901
let ccx = bcx. fcx . ccx ;
902
902
let mut bcx = bcx;
903
903
0 commit comments