Avoid having to count rows

heftig · heftig · commit ebbb8a01bf46 · 2020-02-14T15:38:22.000+01:00
diff --git a/src/database.rs b/src/database.rs
@@ -103,7 +103,6 @@ fn get_initial_data_from_db(
     );
     pb.enable_steady_tick(100);
 
-    let mut num_rows = 0;
     while let Some(row) = rows.next().unwrap() {
         let entry = state_group_map.entry(row.get(0)).or_default();
 
@@ -118,10 +117,9 @@ fn get_initial_data_from_db(
         }
 
         pb.inc(1);
-        num_rows += 1;
     }
 
-    pb.set_length(num_rows);
+    pb.set_length(pb.position());
     pb.finish();
 
     state_group_map

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ fn get_initial_data_from_db(`
`103`	`103`	`);`
`104`	`104`	`pb.enable_steady_tick(100);`
`105`	`105`
`106`		`- let mut num_rows = 0;`
`107`	`106`	`while let Some(row) = rows.next().unwrap() {`
`108`	`107`	`let entry = state_group_map.entry(row.get(0)).or_default();`
`109`	`108`
`@@ -118,10 +117,9 @@ fn get_initial_data_from_db(`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`pb.inc(1);`
`121`		`- num_rows += 1;`
`122`	`120`	`}`
`123`	`121`
`124`		`- pb.set_length(num_rows);`
	`122`	`+ pb.set_length(pb.position());`
`125`	`123`	`pb.finish();`
`126`	`124`
`127`	`125`	`state_group_map`