run_parser

Author: epompeii

services/cli/src/bencher/sub/mod.rs

@@ -4,6 +4,7 @@ mod docker;
 mod mock;
 mod organization;
 mod project;
+mod run;
 mod sub_cmd;
 mod system;
 mod user;
@@ -24,15 +25,12 @@ use project::{
     plot::Plot,
     project::Project,
     report::Report,
-    run::Run,
     testbed::Testbed,
     threshold::Threshold,
 };
-pub use project::{
-    archive::ArchiveError,
-    run::{runner::output::Output, thresholds::ThresholdsError, RunError},
-    threshold::ThresholdError,
-};
+pub use project::{archive::ArchiveError, report::ThresholdsError, threshold::ThresholdError};
+use run::Run;
+pub use run::{runner::output::Output, RunError};
 pub use sub_cmd::SubCmd;
 use system::{auth::Auth, server::Server};
 use user::{token::Token, user::User};

services/cli/src/bencher/sub/project/mod.rs

@@ -9,6 +9,5 @@ pub mod plot;
 #[allow(clippy::module_inception)]
 pub mod project;
 pub mod report;
-pub mod run;
 pub mod testbed;
 pub mod threshold;

services/cli/src/bencher/sub/project/report/create/adapter.rs

@@ -0,0 +1,36 @@
+use bencher_client::types::Adapter;
+
+use crate::parser::project::report::CliReportAdapter;
+
+impl From<CliReportAdapter> for Adapter {
+    fn from(adapter: CliReportAdapter) -> Self {
+        match adapter {
+            CliReportAdapter::Magic => Self::Magic,
+            CliReportAdapter::Json => Self::Json,
+            CliReportAdapter::CSharp => Self::CSharp,
+            CliReportAdapter::CSharpDotNet => Self::CSharpDotNet,
+            CliReportAdapter::Cpp => Self::Cpp,
+            CliReportAdapter::CppCatch2 => Self::CppCatch2,
+            CliReportAdapter::CppGoogle => Self::CppGoogle,
+            CliReportAdapter::Go => Self::Go,
+            CliReportAdapter::GoBench => Self::GoBench,
+            CliReportAdapter::Java => Self::Java,
+            CliReportAdapter::JavaJmh => Self::JavaJmh,
+            CliReportAdapter::Js => Self::Js,
+            CliReportAdapter::JsBenchmark => Self::JsBenchmark,
+            CliReportAdapter::JsTime => Self::JsTime,
+            CliReportAdapter::Python => Self::Python,
+            CliReportAdapter::PythonAsv => Self::PythonAsv,
+            CliReportAdapter::PythonPytest => Self::PythonPytest,
+            CliReportAdapter::Ruby => Self::Ruby,
+            CliReportAdapter::RubyBenchmark => Self::RubyBenchmark,
+            CliReportAdapter::Rust => Self::Rust,
+            CliReportAdapter::RustBench => Self::RustBench,
+            CliReportAdapter::RustCriterion => Self::RustCriterion,
+            CliReportAdapter::RustIai => Self::RustIai,
+            CliReportAdapter::RustIaiCallgrind => Self::RustIaiCallgrind,
+            CliReportAdapter::Shell => Self::Shell,
+            CliReportAdapter::ShellHyperfine => Self::ShellHyperfine,
+        }
+    }
+}

services/cli/src/bencher/sub/project/report/create/average.rs

@@ -0,0 +1,12 @@
+use bencher_client::types::JsonAverage;
+
+use crate::parser::project::report::CliReportAverage;
+
+impl From<CliReportAverage> for JsonAverage {
+    fn from(average: CliReportAverage) -> Self {
+        match average {
+            CliReportAverage::Mean => Self::Mean,
+            CliReportAverage::Median => Self::Median,
+        }
+    }
+}

services/cli/src/bencher/sub/project/report/create/fold.rs

@@ -0,0 +1,14 @@
+use bencher_client::types::JsonFold;
+
+use crate::parser::project::report::CliReportFold;
+
+impl From<CliReportFold> for JsonFold {
+    fn from(fold: CliReportFold) -> Self {
+        match fold {
+            CliReportFold::Min => Self::Min,
+            CliReportFold::Max => Self::Max,
+            CliReportFold::Mean => Self::Mean,
+            CliReportFold::Median => Self::Median,
+        }
+    }
+}

services/cli/src/bencher/sub/project/report/create.rs renamed to services/cli/src/bencher/sub/project/report/create/mod.rs

@@ -7,15 +7,19 @@ use bencher_json::ResourceId;
 use crate::{
     bencher::{
         backend::AuthBackend,
-        sub::{
-            project::{branch::start_point::StartPoint, run::thresholds::Thresholds},
-            SubCmd,
-        },
+        sub::{project::branch::start_point::StartPoint, SubCmd},
     },
     parser::project::report::CliReportCreate,
     CliError,
 };
 
+mod adapter;
+mod average;
+mod fold;
+mod thresholds;
+
+pub use thresholds::{Thresholds, ThresholdsError};
+
 #[derive(Debug, Clone)]
 pub struct Create {
     pub project: ResourceId,

services/cli/src/bencher/sub/project/run/thresholds.rs renamed to services/cli/src/bencher/sub/project/report/create/thresholds.rs

@@ -7,7 +7,7 @@ use crate::{
     bencher::sub::project::threshold::model::Model,
     parser::{
         project::{
-            run::CliRunThresholds,
+            report::CliReportThresholds,
             threshold::{CliModel, CliModelTest},
         },
         ElidedOption,
@@ -44,11 +44,11 @@ pub enum ThresholdsError {
     ExtraUpperBoundaries(Vec<ElidedOption<Boundary>>),
 }
 
-impl TryFrom<CliRunThresholds> for Thresholds {
+impl TryFrom<CliReportThresholds> for Thresholds {
     type Error = ThresholdsError;
 
-    fn try_from(thresholds: CliRunThresholds) -> Result<Self, Self::Error> {
-        let CliRunThresholds {
+    fn try_from(thresholds: CliReportThresholds) -> Result<Self, Self::Error> {
+        let CliReportThresholds {
             threshold_measure,
             threshold_test,
             threshold_min_sample_size,

services/cli/src/bencher/sub/project/report/mod.rs

@@ -5,6 +5,8 @@ mod delete;
 mod list;
 mod view;
 
+pub use create::{Thresholds, ThresholdsError};
+
 #[derive(Debug)]
 pub enum Report {
     List(list::List),