From 4fbbdad5d735821e732f9902f9df6c3c7933ebff Mon Sep 17 00:00:00 2001 From: Adrian Palacios Date: Thu, 18 Nov 2021 21:01:39 +0000 Subject: [PATCH] Add `pub` decls to litani struct fields to avoid warnings --- src/tools/dashboard/src/litani.rs | 150 +++++++++++++++--------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/src/tools/dashboard/src/litani.rs b/src/tools/dashboard/src/litani.rs index 09bc33bef712..42b53c48c87e 100644 --- a/src/tools/dashboard/src/litani.rs +++ b/src/tools/dashboard/src/litani.rs @@ -17,19 +17,19 @@ use std::process::{Child, Command}; /// extend it if advanced features are used (e.g., pools) #[derive(Debug, Deserialize)] pub struct LitaniRun { - aux: Option>, - project: String, - version: String, - version_major: u32, - version_minor: u32, - version_patch: u32, - release_candidate: bool, - run_id: String, - start_time: String, - parallelism: LitaniParalellism, - latest_symlink: Option, - end_time: String, - pipelines: Vec, + pub aux: Option>, + pub project: String, + pub version: String, + pub version_major: u32, + pub version_minor: u32, + pub version_patch: u32, + pub release_candidate: bool, + pub run_id: String, + pub start_time: String, + pub parallelism: LitaniParalellism, + pub latest_symlink: Option, + pub end_time: String, + pub pipelines: Vec, } impl LitaniRun { @@ -39,26 +39,26 @@ impl LitaniRun { } #[derive(Debug, Deserialize)] -struct LitaniParalellism { - trace: Vec, - max_paralellism: Option, - n_proc: u32, +pub struct LitaniParalellism { + pub trace: Vec, + pub max_paralellism: Option, + pub n_proc: u32, } #[derive(Debug, Deserialize)] -struct LitaniTrace { - running: u32, - finished: u32, - total: u32, - time: String, +pub struct LitaniTrace { + pub running: u32, + pub finished: u32, + pub total: u32, + pub time: String, } #[derive(Debug, Deserialize)] pub struct LitaniPipeline { - name: String, - ci_stages: Vec, - url: String, - status: String, + pub name: String, + pub ci_stages: Vec, + pub url: String, + pub status: String, } impl LitaniPipeline { @@ -76,65 +76,65 @@ impl LitaniPipeline { } #[derive(Debug, Deserialize)] -struct LitaniStage { - jobs: Vec, - progress: u32, - complete: bool, - status: String, - url: String, - name: String, +pub struct LitaniStage { + pub jobs: Vec, + pub progress: u32, + pub complete: bool, + pub status: String, + pub url: String, + pub name: String, } // Some attributes in litani's `jobs` are not always included // or they are null, so we use `Option<...>` to deserialize them #[derive(Debug, Deserialize)] -struct LitaniJob { - wrapper_arguments: LitaniWrapperArguments, - complete: bool, - start_time: Option, - timeout_reached: Option, - command_return_code: Option, - memory_trace: Option>, - loaded_outcome_dict: Option>, - outcome: Option, - wrapper_return_code: Option, - stdout: Option>, - stderr: Option>, - end_time: Option, - duration_str: Option, - duration: Option, +pub struct LitaniJob { + pub wrapper_arguments: LitaniWrapperArguments, + pub complete: bool, + pub start_time: Option, + pub timeout_reached: Option, + pub command_return_code: Option, + pub memory_trace: Option>, + pub loaded_outcome_dict: Option>, + pub outcome: Option, + pub wrapper_return_code: Option, + pub stdout: Option>, + pub stderr: Option>, + pub end_time: Option, + pub duration_str: Option, + pub duration: Option, } // Some attributes in litani's `wrapper_arguments` are not always included // or they are null, so we use `Option<...>` to deserialize them #[derive(Debug, Deserialize)] -struct LitaniWrapperArguments { - subcommand: String, - verbose: bool, - very_verbose: bool, - inputs: Vec, - command: String, - outputs: Option>, - pipeline_name: String, - ci_stage: String, - cwd: Option, - timeout: Option, - timeout_ok: Option, - timeout_ignore: Option, - ignore_returns: Option, - ok_returns: Vec, - outcome_table: Option>, - interleave_stdout_stderr: bool, - stdout_file: Option, - stderr_file: Option, - pool: Option, - description: String, - profile_memory: bool, - profile_memory_interval: u32, - phony_outputs: Option>, - tags: Option, - status_file: String, - job_id: String, +pub struct LitaniWrapperArguments { + pub subcommand: String, + pub verbose: bool, + pub very_verbose: bool, + pub inputs: Vec, + pub command: String, + pub outputs: Option>, + pub pipeline_name: String, + pub ci_stage: String, + pub cwd: Option, + pub timeout: Option, + pub timeout_ok: Option, + pub timeout_ignore: Option, + pub ignore_returns: Option, + pub ok_returns: Vec, + pub outcome_table: Option>, + pub interleave_stdout_stderr: bool, + pub stdout_file: Option, + pub stderr_file: Option, + pub pool: Option, + pub description: String, + pub profile_memory: bool, + pub profile_memory_interval: u32, + pub phony_outputs: Option>, + pub tags: Option, + pub status_file: String, + pub job_id: String, } /// Data structure representing a `Litani` build.