Moving FromStr for SamplerType to cli module

tango-bench/src/cli.rs

@@ -20,6 +20,7 @@ use std::{
 };
 
 pub type Result<T> = anyhow::Result<T>;
+pub type StdResult<T, E> = std::result::Result<T, E>;
 
 #[derive(Parser, Debug)]
 enum BenchmarkMode {
@@ -83,6 +84,18 @@ struct Opts {
     coloring_mode: String,
 }
 
+impl FromStr for SamplerType {
+    type Err = Error;
+
+    fn from_str(s: &str) -> StdResult<Self, Self::Err> {
+        match s {
+            "flat" => Ok(SamplerType::Flat),
+            "linear" => Ok(SamplerType::Linear),
+            _ => Err(Error::UnknownSamplerType),
+        }
+    }
+}
+
 /// Definition of the flags required to comply with `cargo bench` calling conventions.
 #[derive(Parser, Debug, Clone)]
 struct CargoBenchFlags {

tango-bench/src/lib.rs

@@ -7,7 +7,7 @@ use std::{
     io,
     ops::{Add, Div, RangeInclusive},
     rc::Rc,
-    str::{FromStr, Utf8Error},
+    str::Utf8Error,
 };
 use thiserror::Error;
 use timer::{ActiveTimer, Timer};
@@ -460,18 +460,6 @@ pub enum SamplerType {
     Linear,
 }
 
-impl FromStr for SamplerType {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "flat" => Ok(SamplerType::Flat),
-            "linear" => Ok(SamplerType::Linear),
-            _ => Err(Error::UnknownSamplerType),
-        }
-    }
-}
-
 pub const DEFAULT_SETTINGS: MeasurementSettings = MeasurementSettings {
     filter_outliers: false,
     samples_per_haystack: 1,