run_parser

Author: epompeii

services/cli/Cargo.toml

@@ -10,9 +10,6 @@ publish = false
 default = ["plus"]
 plus = ["bencher_client/plus", "bencher_comment/plus", "bencher_json/plus"]
 
-[build-dependencies]
-bencher_json = { workspace = true, features = ["lite"] }
-
 [dependencies]
 # Workspace
 bencher_adapter.workspace = true

services/cli/build.rs

@@ -1,5 +1,5 @@
 fn main() {
     // This is here to test that the fingerprinting is working correctly on all platforms.
-    #[allow(clippy::expect_used)]
-    let _ = bencher_json::Fingerprint::new().expect("Failed to create fingerprint");
+    // #[allow(clippy::expect_used)]
+    // let _ = bencher_valid::Fingerprint::new().expect("Failed to create fingerprint");
 }

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

@@ -28,9 +28,7 @@ use project::{
     testbed::Testbed,
     threshold::Threshold,
 };
-pub use project::{
-    archive::ArchiveError, report::thresholds::ThresholdsError, threshold::ThresholdError,
-};
+pub use project::{archive::ArchiveError, report::ThresholdsError, threshold::ThresholdError};
 pub use run::RunError;
 use run::{runner::output::Output, Run};
 pub use sub_cmd::SubCmd;

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

@@ -13,7 +13,12 @@ use crate::{
     CliError,
 };
 
-use super::thresholds::Thresholds;
+mod adapter;
+mod average;
+mod fold;
+mod thresholds;
+
+pub use thresholds::{Thresholds, ThresholdsError};
 
 #[derive(Debug, Clone)]
 pub struct Create {

services/cli/src/bencher/sub/project/report/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

@@ -3,9 +3,10 @@ use crate::{bencher::sub::SubCmd, parser::project::report::CliReport, CliError};
 mod create;
 mod delete;
 mod list;
-pub mod thresholds;
 mod view;
 
+pub use create::{Thresholds, ThresholdsError};
+
 #[derive(Debug)]
 pub enum Report {
     List(list::List),

services/cli/src/bencher/sub/run/adapter.rs

@@ -2,7 +2,7 @@ use bencher_json::{project::branch::BRANCH_MAIN_STR, GitHash, NameId};
 
 use crate::{
     bencher::sub::project::branch::start_point::StartPoint,
-    parser::project::run::{CliRunBranch, CliRunHash},
+    parser::run::{CliRunBranch, CliRunHash},
 };
 
 #[allow(clippy::struct_field_names)]

services/cli/src/bencher/sub/run/average.rs

@@ -2,7 +2,7 @@
 
 use bencher_comment::ReportComment;
 
-use crate::parser::project::run::CliRunCi;
+use crate::parser::run::CliRunCi;
 
 mod github_actions;
 

services/cli/src/bencher/sub/run/branch.rs

@@ -9,7 +9,7 @@ pub enum RunError {
     #[error("{0}")]
     Branch(#[from] super::branch::BranchError),
     #[error("{0}")]
-    Thresholds(#[from] crate::bencher::sub::project::report::thresholds::ThresholdsError),
+    Thresholds(#[from] crate::bencher::sub::project::report::ThresholdsError),
 
     #[error("No default shell command path for target family. Try setting a custom shell with the `--shell` argument.")]
     Shell,

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

@@ -1,4 +1,4 @@
-use crate::parser::project::run::CliRunFormat;
+use crate::parser::run::CliRunFormat;
 
 #[derive(Debug, Clone, Copy)]
 pub enum Format {

services/cli/src/bencher/sub/run/error.rs

@@ -8,16 +8,13 @@ use project::local_project;
 use crate::{
     bencher::backend::AuthBackend,
     cli_eprintln_quietable, cli_println, cli_println_quietable,
-    parser::project::run::{CliRun, CliRunOutput},
+    parser::run::{CliRun, CliRunOutput},
     CliError,
 };
 
-mod adapter;
-mod average;
 mod branch;
 mod ci;
 mod error;
-mod fold;
 mod format;
 mod project;
 pub mod runner;
@@ -32,7 +29,7 @@ use sub_adapter::SubAdapter;
 
 use crate::bencher::SubCmd;
 
-use super::project::report::thresholds::Thresholds;
+use super::project::report::Thresholds;
 
 #[derive(Debug)]
 #[allow(clippy::struct_excessive_bools)]

services/cli/src/bencher/sub/run/fold.rs

@@ -7,7 +7,7 @@ use super::build_time::{BuildCommand, BuildTime};
 use super::file_path::FilePath;
 use super::file_size::FileSize;
 use super::{flag::Flag, output::Output, shell::Shell};
-use crate::{bencher::sub::RunError, parser::project::run::CliRunShell};
+use crate::{bencher::sub::RunError, parser::run::CliRunShell};
 use crate::{cli_eprintln_quietable, cli_println_quietable};
 
 #[derive(Debug, Clone)]

services/cli/src/bencher/sub/run/format.rs

@@ -2,7 +2,7 @@
 
 use std::fmt;
 
-use crate::parser::project::run::CliRunCommand;
+use crate::parser::run::CliRunCommand;
 
 mod build_time;
 pub mod command;

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

@@ -1,4 +1,4 @@
-use crate::parser::project::run::CliRunCommand;
+use crate::parser::run::CliRunCommand;
 
 #[derive(Debug, Clone, Copy)]
 pub struct SubAdapter {

services/cli/src/bencher/sub/run/runner/command.rs

@@ -7,6 +7,7 @@ pub mod docker;
 pub mod mock;
 pub mod organization;
 pub mod project;
+pub mod run;
 pub mod system;
 pub mod user;
 
@@ -16,8 +17,9 @@ use organization::{member::CliMember, CliOrganization};
 use project::{
     alert::CliAlert, archive::CliArchive, benchmark::CliBenchmark, branch::CliBranch,
     measure::CliMeasure, metric::CliMetric, perf::CliPerf, plot::CliPlot, report::CliReport,
-    run::CliRun, testbed::CliTestbed, threshold::CliThreshold, CliProject,
+    testbed::CliTestbed, threshold::CliThreshold, CliProject,
 };
+use run::CliRun;
 use system::{auth::CliAuth, server::CliServer};
 use user::{token::CliToken, CliUser};
 

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

@@ -14,7 +14,6 @@ pub mod metric;
 pub mod perf;
 pub mod plot;
 pub mod report;
-pub mod run;
 pub mod testbed;
 pub mod threshold;