collapse single match blocks

src/multi.rs

@@ -362,15 +362,12 @@ impl MultiState {
     }
 
     fn insert(&mut self, location: InsertLocation) -> usize {
-        let idx = match self.free_set.pop() {
-            Some(idx) => {
-                self.members[idx] = MultiStateMember::default();
-                idx
-            }
-            None => {
-                self.members.push(MultiStateMember::default());
-                self.members.len() - 1
-            }
+        let idx = if let Some(idx) = self.free_set.pop() {
+            self.members[idx] = MultiStateMember::default();
+            idx
+        } else {
+            self.members.push(MultiStateMember::default());
+            self.members.len() - 1
         };
 
         match location {

src/state.rs

@@ -279,15 +279,14 @@ impl ProgressState {
 
     /// The number of steps per second
     pub fn per_sec(&self) -> f64 {
-        match self.status {
-            Status::InProgress => match 1.0 / self.est.seconds_per_step() {
+        if let Status::InProgress = self.status {
+            match 1.0 / self.est.seconds_per_step() {
                 per_sec if per_sec.is_nan() => 0.0,
                 per_sec => per_sec,
-            },
-            _ => {
-                let len = self.len.unwrap_or_else(|| self.pos());
-                len as f64 / self.started.elapsed().as_secs_f64()
             }
+        } else {
+            let len = self.len.unwrap_or_else(|| self.pos());
+            len as f64 / self.started.elapsed().as_secs_f64()
         }
     }