hive-forge: fix ci-log clippy cast_possible_truncation (use try_from)
This commit is contained in:
parent
2223af1b21
commit
a69844d463
1 changed files with 14 additions and 8 deletions
|
|
@ -124,7 +124,11 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
|
|||
);
|
||||
}
|
||||
for sl in &steps_log {
|
||||
let idx = sl.get("step").and_then(Value::as_u64).unwrap_or_default() as usize;
|
||||
let idx = sl
|
||||
.get("step")
|
||||
.and_then(Value::as_u64)
|
||||
.and_then(|n| usize::try_from(n).ok())
|
||||
.unwrap_or_default();
|
||||
println!("=== step {idx}: {} ===", step_name(steps.get(idx)));
|
||||
if let Some(lines) = sl.get("lines").and_then(Value::as_array) {
|
||||
for line in lines {
|
||||
|
|
@ -141,11 +145,10 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
|
||||
#[test]
|
||||
fn steps_of_reads_current_job_steps() {
|
||||
let view = json!({
|
||||
let view = serde_json::json!({
|
||||
"state": { "currentJob": { "steps": [
|
||||
{ "summary": "Set up job" },
|
||||
{ "summary": "Run tests" }
|
||||
|
|
@ -159,18 +162,21 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn steps_of_missing_is_empty() {
|
||||
assert!(steps_of(&json!({})).is_empty());
|
||||
assert!(steps_of(&json!({ "state": {} })).is_empty());
|
||||
assert!(steps_of(&serde_json::json!({})).is_empty());
|
||||
assert!(steps_of(&serde_json::json!({ "state": {} })).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn step_name_falls_back() {
|
||||
assert_eq!(step_name(Some(&json!({ "name": "compile" }))), "compile");
|
||||
assert_eq!(step_name(Some(&json!({}))), "step");
|
||||
assert_eq!(
|
||||
step_name(Some(&serde_json::json!({ "name": "compile" }))),
|
||||
"compile"
|
||||
);
|
||||
assert_eq!(step_name(Some(&serde_json::json!({}))), "step");
|
||||
assert_eq!(step_name(None), "step");
|
||||
// `summary` wins over `name` when both are present.
|
||||
assert_eq!(
|
||||
step_name(Some(&json!({ "summary": "a", "name": "b" }))),
|
||||
step_name(Some(&serde_json::json!({ "summary": "a", "name": "b" }))),
|
||||
"a"
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue