Commit 7b56700

authored

Merge pull request clearloop#8 from hulufei/master

Fix panic on stat command with zero numbers

2 parents a99f137 + a2fd3cc commit 7b56700Copy full SHA for 7b56700

File tree

-3

lines changed

-3

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,9 @@ impl Command for StatCommand {`
`99`	`99`	`_ => continue,`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ let checked_div = \|lhs: f64, rhs: f64\| if rhs == 0. { 0. } else { lhs / rhs };`
`102`	`103`	`let count = format!("{}/{}", l.1, l.0);`
`103`		`- let pct = format!("( {:.2} %)", ((100.0 * l.1) / l.0));`
	`104`	`+ let pct = format!("( {:.2} %)", checked_div(100.0 * l.1, l.0));`
`104`	`105`	`let mut line = "".to_string();`
`105`	`106`	`line.push_str(&" ".digit(8 - (count.len() as i32)));`
`106`	`107`	`line.push_str(&count);`
`@@ -109,8 +110,12 @@ impl Command for StatCommand {`
`109`	`110`	`print!("{}", line);`
`110`	`111`	`print!(" ");`
`111`	`112`
`112`		`- let done = "░".repeat(((32.00 * l.1) / l.0) as usize).bright_green();`
`113`		`- let udone = "░".repeat(32 - ((32.00 * l.1) / l.0) as usize).red();`
	`113`	`+ let done = "░"`
	`114`	`+ .repeat(checked_div(32.00 * l.1, l.0) as usize)`
	`115`	`+ .bright_green();`
	`116`	`+ let udone = "░"`
	`117`	`+ .repeat(32 - checked_div(32.00 * l.1, l.0) as usize)`
	`118`	`+ .red();`
`114`	`119`	`print!("{}", done);`
`115`	`120`	`println!("{}", udone);`
`116`	`121`	`}`

Comments

(0)