@@ -146,6 +146,7 @@ fn create_mappings<'tcx>(
146
146
. expect ( "all BCBs with spans were given counters" )
147
147
. as_term ( )
148
148
} ;
149
+ let region_for_span = |span : Span | make_code_region ( source_map, file_name, span, body_span) ;
149
150
150
151
let mut mappings = Vec :: new ( ) ;
151
152
@@ -154,7 +155,7 @@ fn create_mappings<'tcx>(
154
155
let kind = match bcb_mapping_kind {
155
156
BcbMappingKind :: Code ( bcb) => MappingKind :: Code ( term_for_bcb ( bcb) ) ,
156
157
} ;
157
- let code_region = make_code_region ( source_map , file_name , span, body_span ) ?;
158
+ let code_region = region_for_span ( span) ?;
158
159
Some ( Mapping { kind, code_region } )
159
160
} ,
160
161
) ) ;
@@ -164,14 +165,14 @@ fn create_mappings<'tcx>(
164
165
let true_term = term_for_bcb ( true_bcb) ;
165
166
let false_term = term_for_bcb ( false_bcb) ;
166
167
let kind = MappingKind :: Branch { true_term, false_term } ;
167
- let code_region = make_code_region ( source_map , file_name , span, body_span ) ?;
168
+ let code_region = region_for_span ( span) ?;
168
169
Some ( Mapping { kind, code_region } )
169
170
} ,
170
171
) ) ;
171
172
172
173
mappings. extend ( coverage_spans. mcdc_branches . iter ( ) . filter_map (
173
174
|& mappings:: MCDCBranch { span, true_bcb, false_bcb, condition_info, decision_depth : _ } | {
174
- let code_region = make_code_region ( source_map , file_name , span, body_span ) ?;
175
+ let code_region = region_for_span ( span) ?;
175
176
let true_term = term_for_bcb ( true_bcb) ;
176
177
let false_term = term_for_bcb ( false_bcb) ;
177
178
let kind = match condition_info {
@@ -184,7 +185,7 @@ fn create_mappings<'tcx>(
184
185
185
186
mappings. extend ( coverage_spans. mcdc_decisions . iter ( ) . filter_map (
186
187
|& mappings:: MCDCDecision { span, bitmap_idx, conditions_num, .. } | {
187
- let code_region = make_code_region ( source_map , file_name , span, body_span ) ?;
188
+ let code_region = region_for_span ( span) ?;
188
189
let kind = MappingKind :: MCDCDecision ( DecisionInfo { bitmap_idx, conditions_num } ) ;
189
190
Some ( Mapping { kind, code_region } )
190
191
} ,
0 commit comments