fix "zero-time measurements" bug

Cargo.toml

@@ -21,6 +21,9 @@ categories  = ["development-tools::profiling"]
 license     = "Apache-2.0 OR MIT"
 exclude     = ["book/*"]
 
+[lints.clippy]
+uninlined_format_args = "allow"
+
 [dependencies]
 anes           = "0.1.4"
 criterion-plot = { path = "plot", version = "0.5.0" }
@@ -35,6 +38,13 @@ cast           = "0.3"
 num-traits     = { version = "0.2", default-features = false, features = ["std"] }
 oorandom       = "11.1"
 regex          = { version = "1.5.1", default-features = false, features = ["std"] }
+rayon = "1.3"
+
+[target.'cfg(target_vendor="apple")'.dependencies]
+mach-sys = "0.5"
+
+[target.'cfg(target_arch="x86_64")'.dependencies]
+cpuid = "0.1.1"
 
 # Optional dependencies
 rayon = { version = "1.3", optional = true }

plot/src/axis.rs

@@ -159,27 +159,27 @@ impl Script for (Axis, &Properties) {
         let axis_ = axis.display();
 
         let mut script = if properties.hidden {
-            return format!("unset {}tics\n", axis_);
+            return format!("unset {axis_}tics\n");
         } else {
-            format!("set {}tics nomirror ", axis_)
+            format!("set {axis_}tics nomirror ")
         };
 
         if let Some(ref tics) = properties.tics {
-            script.push_str(&format!("({})", tics))
+            script.push_str(&format!("({tics})"))
         }
 
         script.push('\n');
 
         if let Some(ref label) = properties.label {
-            script.push_str(&format!("set {}label '{}'\n", axis_, label))
+            script.push_str(&format!("set {axis_}label '{label}'\n"))
         }
 
         if let Some((low, high)) = properties.range {
-            script.push_str(&format!("set {}range [{}:{}]\n", axis_, low, high))
+            script.push_str(&format!("set {axis_}range [{low}:{high}]\n"))
         }
 
         if properties.logarithmic {
-            script.push_str(&format!("set logscale {}\n", axis_));
+            script.push_str(&format!("set logscale {axis_}\n"));
         }
 
         for (grid, properties) in properties.grids.iter() {

plot/src/candlestick.rs

@@ -32,7 +32,7 @@ impl Script for Properties {
         script.push_str(&format!("lt {} ", self.line_type.display()));
 
         if let Some(lw) = self.linewidth {
-            script.push_str(&format!("lw {} ", lw))
+            script.push_str(&format!("lw {lw} "))
         }
 
         if let Some(color) = self.color {

plot/src/curve.rs

@@ -48,7 +48,7 @@ impl Script for Properties {
         script.push_str(&format!("lt {} ", self.line_type.display()));
 
         if let Some(lw) = self.linewidth {
-            script.push_str(&format!("lw {} ", lw))
+            script.push_str(&format!("lw {lw} "))
         }
 
         if let Some(color) = self.color {
@@ -60,7 +60,7 @@ impl Script for Properties {
         }
 
         if let Some(ps) = self.point_size {
-            script.push_str(&format!("ps {} ", ps))
+            script.push_str(&format!("ps {ps} "))
         }
 
         if let Some(ref label) = self.label {

plot/src/display.rs

@@ -38,7 +38,7 @@ impl Display<Cow<'static, str>> for Color {
             Color::Green => Cow::from("green"),
             Color::Magenta => Cow::from("magenta"),
             Color::Red => Cow::from("red"),
-            Color::Rgb(r, g, b) => Cow::from(format!("#{:02x}{:02x}{:02x}", r, g, b)),
+            Color::Rgb(r, g, b) => Cow::from(format!("#{r:02x}{g:02x}{b:02x}")),
             Color::White => Cow::from("white"),
             Color::Yellow => Cow::from("yellow"),
         }

plot/src/errorbar.rs

@@ -41,7 +41,7 @@ impl Script for Properties {
         script.push_str(&format!("lt {} ", self.line_type.display()));
 
         if let Some(lw) = self.linewidth {
-            script.push_str(&format!("lw {} ", lw))
+            script.push_str(&format!("lw {lw} "))
         }
 
         if let Some(color) = self.color {
@@ -53,7 +53,7 @@ impl Script for Properties {
         }
 
         if let Some(ps) = self.point_size {
-            script.push_str(&format!("ps {} ", ps))
+            script.push_str(&format!("ps {ps} "))
         }
 
         if let Some(ref label) = self.label {

plot/src/filledcurve.rs

@@ -37,7 +37,7 @@ impl Script for Properties {
         script.push_str("fillstyle ");
 
         if let Some(opacity) = self.opacity {
-            script.push_str(&format!("solid {} ", opacity))
+            script.push_str(&format!("solid {opacity} "))
         }
 
         // TODO border shoulde be configurable

plot/src/grid.rs

@@ -40,7 +40,7 @@ impl Script for (Axis, Grid, &Properties) {
         if properties.hidden {
             String::new()
         } else {
-            format!("set grid {}{}tics\n", grid, axis)
+            format!("set grid {grid}{axis}tics\n")
         }
     }
 }

plot/src/key.rs

@@ -81,7 +81,7 @@ impl Script for Properties {
         }
 
         if let Some(ref title) = self.title {
-            script.push_str(&format!("title '{}' ", title))
+            script.push_str(&format!("title '{title}' "))
         }
 
         if self.boxed {

plot/src/lib.rs

@@ -441,11 +441,11 @@ impl Figure {
         ));
 
         if let Some(width) = self.box_width {
-            s.push_str(&format!("set boxwidth {}\n", width))
+            s.push_str(&format!("set boxwidth {width}\n"))
         }
 
         if let Some(ref title) = self.title {
-            s.push_str(&format!("set title '{}'\n", title))
+            s.push_str(&format!("set title '{title}'\n"))
         }
 
         for axis in self.axes.iter() {
@@ -461,20 +461,20 @@ impl Figure {
         }
 
         if let Some(alpha) = self.alpha {
-            s.push_str(&format!("set style fill transparent solid {}\n", alpha))
+            s.push_str(&format!("set style fill transparent solid {alpha}\n"))
         }
 
         s.push_str(&format!("set terminal {} dashed", self.terminal.display()));
 
         if let Some((width, height)) = self.size {
-            s.push_str(&format!(" size {}, {}", width, height))
+            s.push_str(&format!(" size {width}, {height}"))
         }
 
         if let Some(ref name) = self.font {
             if let Some(size) = self.font_size {
-                s.push_str(&format!(" font '{},{}'", name, size))
+                s.push_str(&format!(" font '{name},{size}'"))
             } else {
-                s.push_str(&format!(" font '{}'", name))
+                s.push_str(&format!(" font '{name}'"))
             }
         }
 
@@ -936,16 +936,14 @@ pub enum VersionError {
 impl fmt::Display for VersionError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            VersionError::Exec(err) => write!(f, "`gnuplot --version` failed: {}", err),
+            VersionError::Exec(err) => write!(f, "`gnuplot --version` failed: {err}"),
             VersionError::Error(msg) => {
-                write!(f, "`gnuplot --version` failed with error message:\n{}", msg)
+                write!(f, "`gnuplot --version` failed with error message:\n{msg}")
             }
             VersionError::OutputError => write!(f, "`gnuplot --version` returned invalid utf-8"),
             VersionError::ParseError(msg) => write!(
                 f,
-                "`gnuplot --version` returned an unparsable version string: {}",
-                msg
-            ),
+                "`gnuplot --version` returned an unparsable version string: {msg}"),
         }
     }
 }

src/analysis/mod.rs

@@ -71,7 +71,7 @@ pub(crate) fn common<M: Measurement, T: ?Sized>(
         match loaded {
             Err(err) => panic!(
                 "Baseline '{base}' must exist before it can be loaded; try --save-baseline {base}. Error: {err}",
-                base = baseline, err = err
+                base=criterion.baseline_directory,
             ),
             Ok(samples) => {
                 sampling_mode = samples.sampling_mode;
@@ -121,6 +121,14 @@ pub(crate) fn common<M: Measurement, T: ?Sized>(
         return;
     }
 
+    if times.contains(&f64::NAN) {
+        error!(
+            "At least one measurement of benchmark {} had a NAN.",
+            id.as_title()
+        );
+        return;
+    }
+
     let avg_times = iters
         .iter()
         .zip(times.iter())