diff --git a/src/analysis.rs b/src/analysis.rs index 9d48828..7149252 100644 --- a/src/analysis.rs +++ b/src/analysis.rs @@ -64,8 +64,8 @@ pub(crate) fn analysis<'a>( relative_distributions, significance_threshold: config.significance_level, noise_threshold: config.noise_threshold, - base_iter_counts: old_sample.iteration_count.iter().copied().collect(), - base_sample_times: old_sample.sample_values.iter().copied().collect(), + base_iter_counts: old_sample.iteration_count.to_vec(), + base_sample_times: old_sample.sample_values.to_vec(), base_avg_times, base_estimates: old_estimates.clone(), }) diff --git a/src/config.rs b/src/config.rs index 0f21763..4147332 100644 --- a/src/config.rs +++ b/src/config.rs @@ -62,7 +62,7 @@ impl Default for Colors { } } -#[derive(Deserialize, Debug)] +#[derive(Deserialize, Debug, Default)] #[serde(default)] /// Struct to hold the various configuration settings that we can read from the TOML config file. struct TomlConfig { @@ -77,16 +77,6 @@ struct TomlConfig { /// colorblindness, or just to make things look prettier. pub colors: Colors, } -impl Default for TomlConfig { - fn default() -> Self { - TomlConfig { - criterion_home: None, - output_format: None, - plotting_backend: None, - colors: Default::default(), - } - } -} #[derive(Debug)] pub enum OutputFormat { diff --git a/src/connection.rs b/src/connection.rs index 47001d1..9328422 100644 --- a/src/connection.rs +++ b/src/connection.rs @@ -60,10 +60,9 @@ pub struct Connection { socket: TcpStream, receive_buffer: Vec, send_buffer: Vec, - - criterion_rs_version: [u8; 3], - protocol_version: u16, - protocol_format: ProtocolFormat, + // criterion_rs_version: [u8; 3], + // protocol_version: u16, + // protocol_format: ProtocolFormat, } impl Connection { /// Perform the connection handshake and wrap the TCP stream in a Connection object if successful. @@ -103,10 +102,9 @@ impl Connection { socket, receive_buffer: vec![], send_buffer: vec![], - - criterion_rs_version, - protocol_version, - protocol_format, + // criterion_rs_version, + // protocol_version, + // protocol_format, }) } diff --git a/src/plot/gnuplot_backend/mod.rs b/src/plot/gnuplot_backend/mod.rs index e2311d1..22c8cd9 100644 --- a/src/plot/gnuplot_backend/mod.rs +++ b/src/plot/gnuplot_backend/mod.rs @@ -35,7 +35,7 @@ mod summary; mod t_test; fn gnuplot_escape(string: &str) -> String { - string.replace("_", "\\_").replace("'", "''") + string.replace('_', "\\_").replace('\'', "''") } static DEFAULT_FONT: &str = "Helvetica";