Skip to content

Commit 2b893fe

Browse files
adpaco-awstedinski
authored andcommitted
Add pub decls to litani struct fields to avoid warnings (rust-lang#654)
1 parent bf7224a commit 2b893fe

File tree

1 file changed

+75
-75
lines changed

1 file changed

+75
-75
lines changed

src/tools/dashboard/src/litani.rs

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ use std::process::{Child, Command};
1717
/// extend it if advanced features are used (e.g., pools)
1818
#[derive(Debug, Deserialize)]
1919
pub struct LitaniRun {
20-
aux: Option<HashMap<String, String>>,
21-
project: String,
22-
version: String,
23-
version_major: u32,
24-
version_minor: u32,
25-
version_patch: u32,
26-
release_candidate: bool,
27-
run_id: String,
28-
start_time: String,
29-
parallelism: LitaniParalellism,
30-
latest_symlink: Option<String>,
31-
end_time: String,
32-
pipelines: Vec<LitaniPipeline>,
20+
pub aux: Option<HashMap<String, String>>,
21+
pub project: String,
22+
pub version: String,
23+
pub version_major: u32,
24+
pub version_minor: u32,
25+
pub version_patch: u32,
26+
pub release_candidate: bool,
27+
pub run_id: String,
28+
pub start_time: String,
29+
pub parallelism: LitaniParalellism,
30+
pub latest_symlink: Option<String>,
31+
pub end_time: String,
32+
pub pipelines: Vec<LitaniPipeline>,
3333
}
3434

3535
impl LitaniRun {
@@ -39,26 +39,26 @@ impl LitaniRun {
3939
}
4040

4141
#[derive(Debug, Deserialize)]
42-
struct LitaniParalellism {
43-
trace: Vec<LitaniTrace>,
44-
max_paralellism: Option<u32>,
45-
n_proc: u32,
42+
pub struct LitaniParalellism {
43+
pub trace: Vec<LitaniTrace>,
44+
pub max_paralellism: Option<u32>,
45+
pub n_proc: u32,
4646
}
4747

4848
#[derive(Debug, Deserialize)]
49-
struct LitaniTrace {
50-
running: u32,
51-
finished: u32,
52-
total: u32,
53-
time: String,
49+
pub struct LitaniTrace {
50+
pub running: u32,
51+
pub finished: u32,
52+
pub total: u32,
53+
pub time: String,
5454
}
5555

5656
#[derive(Debug, Deserialize)]
5757
pub struct LitaniPipeline {
58-
name: String,
59-
ci_stages: Vec<LitaniStage>,
60-
url: String,
61-
status: String,
58+
pub name: String,
59+
pub ci_stages: Vec<LitaniStage>,
60+
pub url: String,
61+
pub status: String,
6262
}
6363

6464
impl LitaniPipeline {
@@ -76,65 +76,65 @@ impl LitaniPipeline {
7676
}
7777

7878
#[derive(Debug, Deserialize)]
79-
struct LitaniStage {
80-
jobs: Vec<LitaniJob>,
81-
progress: u32,
82-
complete: bool,
83-
status: String,
84-
url: String,
85-
name: String,
79+
pub struct LitaniStage {
80+
pub jobs: Vec<LitaniJob>,
81+
pub progress: u32,
82+
pub complete: bool,
83+
pub status: String,
84+
pub url: String,
85+
pub name: String,
8686
}
8787

8888
// Some attributes in litani's `jobs` are not always included
8989
// or they are null, so we use `Option<...>` to deserialize them
9090
#[derive(Debug, Deserialize)]
91-
struct LitaniJob {
92-
wrapper_arguments: LitaniWrapperArguments,
93-
complete: bool,
94-
start_time: Option<String>,
95-
timeout_reached: Option<bool>,
96-
command_return_code: Option<i32>,
97-
memory_trace: Option<HashMap<String, String>>,
98-
loaded_outcome_dict: Option<HashMap<String, String>>,
99-
outcome: Option<String>,
100-
wrapper_return_code: Option<i32>,
101-
stdout: Option<Vec<String>>,
102-
stderr: Option<Vec<String>>,
103-
end_time: Option<String>,
104-
duration_str: Option<String>,
105-
duration: Option<u32>,
91+
pub struct LitaniJob {
92+
pub wrapper_arguments: LitaniWrapperArguments,
93+
pub complete: bool,
94+
pub start_time: Option<String>,
95+
pub timeout_reached: Option<bool>,
96+
pub command_return_code: Option<i32>,
97+
pub memory_trace: Option<HashMap<String, String>>,
98+
pub loaded_outcome_dict: Option<HashMap<String, String>>,
99+
pub outcome: Option<String>,
100+
pub wrapper_return_code: Option<i32>,
101+
pub stdout: Option<Vec<String>>,
102+
pub stderr: Option<Vec<String>>,
103+
pub end_time: Option<String>,
104+
pub duration_str: Option<String>,
105+
pub duration: Option<u32>,
106106
}
107107

108108
// Some attributes in litani's `wrapper_arguments` are not always included
109109
// or they are null, so we use `Option<...>` to deserialize them
110110
#[derive(Debug, Deserialize)]
111-
struct LitaniWrapperArguments {
112-
subcommand: String,
113-
verbose: bool,
114-
very_verbose: bool,
115-
inputs: Vec<String>,
116-
command: String,
117-
outputs: Option<Vec<String>>,
118-
pipeline_name: String,
119-
ci_stage: String,
120-
cwd: Option<String>,
121-
timeout: Option<u32>,
122-
timeout_ok: Option<bool>,
123-
timeout_ignore: Option<bool>,
124-
ignore_returns: Option<bool>,
125-
ok_returns: Vec<String>,
126-
outcome_table: Option<HashMap<String, String>>,
127-
interleave_stdout_stderr: bool,
128-
stdout_file: Option<String>,
129-
stderr_file: Option<String>,
130-
pool: Option<u32>,
131-
description: String,
132-
profile_memory: bool,
133-
profile_memory_interval: u32,
134-
phony_outputs: Option<Vec<String>>,
135-
tags: Option<String>,
136-
status_file: String,
137-
job_id: String,
111+
pub struct LitaniWrapperArguments {
112+
pub subcommand: String,
113+
pub verbose: bool,
114+
pub very_verbose: bool,
115+
pub inputs: Vec<String>,
116+
pub command: String,
117+
pub outputs: Option<Vec<String>>,
118+
pub pipeline_name: String,
119+
pub ci_stage: String,
120+
pub cwd: Option<String>,
121+
pub timeout: Option<u32>,
122+
pub timeout_ok: Option<bool>,
123+
pub timeout_ignore: Option<bool>,
124+
pub ignore_returns: Option<bool>,
125+
pub ok_returns: Vec<String>,
126+
pub outcome_table: Option<HashMap<String, String>>,
127+
pub interleave_stdout_stderr: bool,
128+
pub stdout_file: Option<String>,
129+
pub stderr_file: Option<String>,
130+
pub pool: Option<u32>,
131+
pub description: String,
132+
pub profile_memory: bool,
133+
pub profile_memory_interval: u32,
134+
pub phony_outputs: Option<Vec<String>>,
135+
pub tags: Option<String>,
136+
pub status_file: String,
137+
pub job_id: String,
138138
}
139139

140140
/// Data structure representing a `Litani` build.

0 commit comments

Comments
 (0)