Skip to content

Commit cf2d741

Browse files
committed
coverage: Extract helper region_for_span
1 parent 23b6508 commit cf2d741

File tree

1 file changed

+5
-4
lines changed
  • compiler/rustc_mir_transform/src/coverage

1 file changed

+5
-4
lines changed

Diff for: compiler/rustc_mir_transform/src/coverage/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ fn create_mappings<'tcx>(
146146
.expect("all BCBs with spans were given counters")
147147
.as_term()
148148
};
149+
let region_for_span = |span: Span| make_code_region(source_map, file_name, span, body_span);
149150

150151
let mut mappings = Vec::new();
151152

@@ -154,7 +155,7 @@ fn create_mappings<'tcx>(
154155
let kind = match bcb_mapping_kind {
155156
BcbMappingKind::Code(bcb) => MappingKind::Code(term_for_bcb(bcb)),
156157
};
157-
let code_region = make_code_region(source_map, file_name, span, body_span)?;
158+
let code_region = region_for_span(span)?;
158159
Some(Mapping { kind, code_region })
159160
},
160161
));
@@ -164,14 +165,14 @@ fn create_mappings<'tcx>(
164165
let true_term = term_for_bcb(true_bcb);
165166
let false_term = term_for_bcb(false_bcb);
166167
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)?;
168169
Some(Mapping { kind, code_region })
169170
},
170171
));
171172

172173
mappings.extend(coverage_spans.mcdc_branches.iter().filter_map(
173174
|&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)?;
175176
let true_term = term_for_bcb(true_bcb);
176177
let false_term = term_for_bcb(false_bcb);
177178
let kind = match condition_info {
@@ -184,7 +185,7 @@ fn create_mappings<'tcx>(
184185

185186
mappings.extend(coverage_spans.mcdc_decisions.iter().filter_map(
186187
|&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)?;
188189
let kind = MappingKind::MCDCDecision(DecisionInfo { bitmap_idx, conditions_num });
189190
Some(Mapping { kind, code_region })
190191
},

0 commit comments

Comments
 (0)