Simplfy apply_draw_state

Make it more obvious we only draw if we need to

src/state.rs

@@ -503,37 +503,32 @@ impl ProgressDrawTarget {
 
     /// Apply the given draw state (draws it).
     pub(crate) fn apply_draw_state(&mut self, draw_state: ProgressDrawState) -> io::Result<()> {
-        let (term, last_line_count, last_draw) = match self.kind {
+        match self.kind {
             ProgressDrawTargetKind::Term {
                 ref term,
                 ref mut last_line_count,
                 rate,
                 ref mut last_draw,
             } if draw_state.finished || draw_state.force_draw || last_draw.elapsed() > rate => {
-                (term, last_line_count, last_draw)
+                if !draw_state.lines.is_empty() && draw_state.move_cursor {
+                    term.move_cursor_up(*last_line_count)?;
+                } else {
+                    term.clear_last_lines(*last_line_count)?;
+                }
+
+                draw_state.draw_to_term(term)?;
+                term.flush()?;
+                *last_line_count = draw_state.lines.len() - draw_state.orphan_lines;
+                *last_draw = Instant::now();
+
+                Ok(())
             }
             ProgressDrawTargetKind::Remote { idx, ref state, .. } => {
-                return state
-                    .write()
-                    .unwrap()
-                    .draw(idx, draw_state)
-                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e));
+                state.write().unwrap().draw(idx, draw_state)
             }
             // Hidden, finished, or no need to refresh yet
-            _ => return Ok(()),
-        };
-
-        if !draw_state.lines.is_empty() && draw_state.move_cursor {
-            term.move_cursor_up(*last_line_count)?;
-        } else {
-            term.clear_last_lines(*last_line_count)?;
+            _ => Ok(()),
         }
-
-        draw_state.draw_to_term(term)?;
-        term.flush()?;
-        *last_line_count = draw_state.lines.len() - draw_state.orphan_lines;
-        *last_draw = Instant::now();
-        Ok(())
     }
 
     /// Properly disconnects from the draw target