s/merged_block_count/statements_to_merge/g

Markus Westerlind · Markus Westerlind · commit 851e9d64baa8 · 2020-03-02T20:08:21.000+01:00
diff --git a/src/librustc_mir/transform/simplify.rs b/src/librustc_mir/transform/simplify.rs
@@ -128,12 +128,12 @@ impl<'a, 'tcx> CfgSimplifier<'a, 'tcx> {
                     changed |= inner_changed;
                 }
 
-                let merged_block_count =
+                let statements_to_merge =
                     merged_blocks.iter().map(|&i| self.basic_blocks[i].statements.len()).sum();
 
-                if merged_block_count > 0 {
+                if statements_to_merge > 0 {
                     let mut statements = std::mem::take(&mut self.basic_blocks[bb].statements);
-                    statements.reserve(merged_block_count);
+                    statements.reserve(statements_to_merge);
                     for &from in &merged_blocks {
                         statements.append(&mut self.basic_blocks[from].statements);
                     }

Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,12 @@ impl<'a, 'tcx> CfgSimplifier<'a, 'tcx> {`
`128`	`128`	`changed \|= inner_changed;`
`129`	`129`	`}`
`130`	`130`
`131`		`- let merged_block_count =`
	`131`	`+ let statements_to_merge =`
`132`	`132`	`merged_blocks.iter().map(\|&i\| self.basic_blocks[i].statements.len()).sum();`
`133`	`133`
`134`		`- if merged_block_count > 0 {`
	`134`	`+ if statements_to_merge > 0 {`
`135`	`135`	`let mut statements = std::mem::take(&mut self.basic_blocks[bb].statements);`
`136`		`- statements.reserve(merged_block_count);`
	`136`	`+ statements.reserve(statements_to_merge);`
`137`	`137`	`for &from in &merged_blocks {`
`138`	`138`	`statements.append(&mut self.basic_blocks[from].statements);`
`139`	`139`	`}`