@@ -248,13 +248,12 @@ impl<'a> MakeBcbCounters<'a> {
248
248
fn make_branch_counters (
249
249
& mut self ,
250
250
traversal : & TraverseCoverageGraphWithLoops < ' _ > ,
251
- branching_bcb : BasicCoverageBlock ,
251
+ from_bcb : BasicCoverageBlock ,
252
252
branching_counter_operand : CovTerm ,
253
253
) {
254
- let branches = self . bcb_branches ( branching_bcb ) ;
254
+ let branches = self . bcb_branches ( from_bcb ) ;
255
255
debug ! (
256
- "{:?} has some branch(es) without counters:\n {}" ,
257
- branching_bcb,
256
+ "{from_bcb:?} has some branch(es) without counters:\n {}" ,
258
257
branches
259
258
. iter( )
260
259
. map( |branch| { format!( "{:?}: {:?}" , branch, self . branch_counter( branch) ) } )
@@ -279,14 +278,13 @@ impl<'a> MakeBcbCounters<'a> {
279
278
if branch != expression_branch {
280
279
let branch_counter_operand = if branch. is_only_path_to_target ( ) {
281
280
debug ! (
282
- " {:?} has only one incoming edge (from {:?}), so adding a \
283
- counter",
284
- branch, branching_bcb
281
+ " {branch:?} has only one incoming edge (from {from_bcb:?}), \
282
+ so adding a counter",
285
283
) ;
286
284
self . get_or_make_counter_operand ( branch. target_bcb )
287
285
} else {
288
286
debug ! ( " {:?} has multiple incoming edges, so adding an edge counter" , branch) ;
289
- self . get_or_make_edge_counter_operand ( branching_bcb , branch. target_bcb )
287
+ self . get_or_make_edge_counter_operand ( from_bcb , branch. target_bcb )
290
288
} ;
291
289
if let Some ( sumup_counter_operand) =
292
290
some_sumup_counter_operand. replace ( branch_counter_operand)
@@ -323,7 +321,7 @@ impl<'a> MakeBcbCounters<'a> {
323
321
if expression_branch. is_only_path_to_target ( ) {
324
322
self . coverage_counters . set_bcb_counter ( bcb, expression) ;
325
323
} else {
326
- self . coverage_counters . set_bcb_edge_counter ( branching_bcb , bcb, expression) ;
324
+ self . coverage_counters . set_bcb_edge_counter ( from_bcb , bcb, expression) ;
327
325
}
328
326
}
329
327
0 commit comments