Add some scopes for better readability

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 22 insertions, 15 deletions

diff --git a/bin/core/imag-diagnostics/src/lib.rs b/bin/core/imag-diagnostics/src/lib.rs
index 4b6e53c4..427abc67 100644
--- a/bin/core/imag-diagnostics/src/lib.rs
+++ b/bin/core/imag-diagnostics/src/lib.rs
@@ -116,16 +116,19 @@ impl ImagApplication for ImagDiagnostics {
         let tick_chars  = get_config(&rt, "rt.progressticker_chars")?;
         let verbose     = rt.cli().is_present("more-output");
 
-        let style = if let Some(tick_chars) = tick_chars {
-            ProgressStyle::default_spinner().tick_chars(&tick_chars)
-        } else {
-            ProgressStyle::default_spinner()
+        let progressbar = {
+            let p = ProgressBar::new(100);
+            p.set_style({
+                if let Some(tick_chars) = tick_chars {
+                    ProgressStyle::default_spinner().tick_chars(&tick_chars)
+                } else {
+                    ProgressStyle::default_spinner()
+                }
+            });
+            p.set_message("Accumulating data");
+            p
         };
 
-        let progressbar = ProgressBar::new(100);
-        progressbar.set_style(style);
-        progressbar.set_message("Accumulating data");
-
         let diags = rt.store()
             .entries()?
             .into_get_iter()
@@ -140,14 +143,18 @@ impl ImagApplication for ImagDiagnostics {
             .collect::<Result<Vec<_>>>()?;
 
         let n           = diags.len();
-        let progressbar = ProgressBar::new(n as u64);
-        let style       = if let Some(template) = template {
-            ProgressStyle::default_bar().template(&template)
-        } else {
-            ProgressStyle::default_bar()
+        let progressbar = {
+            let p = ProgressBar::new(n as u64);
+            p.set_style({
+                if let Some(template) = template {
+                    ProgressStyle::default_bar().template(&template)
+                } else {
+                    ProgressStyle::default_bar()
+                }
+            });
+            p.set_message("Calculating stats");
+            p
         };
-        progressbar.set_style(style);
-        progressbar.set_message("Calculating stats");
 
         let mut version_counts        : BTreeMap<String, usize> = BTreeMap::new();
         let mut sum_header_sections   = 0;