Skip to content

fix(bootstrap): deserialize null as f64::NAN #136034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2025
+8 −0
Merged

fix(bootstrap): deserialize null as f64::NAN #136034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/build_helper/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub struct JsonInvocation {
//
// This is necessary to easily correlate this invocation with logs or other data.
pub start_time: u64,
#[serde(deserialize_with = "null_as_f64_nan")]
pub duration_including_children_sec: f64,
pub children: Vec<JsonNode>,
}
Expand All @@ -28,6 +29,7 @@ pub enum JsonNode {
type_: String,
debug_repr: String,

#[serde(deserialize_with = "null_as_f64_nan")]
duration_excluding_children_sec: f64,
system_stats: JsonStepSystemStats,

Expand Down Expand Up @@ -88,5 +90,11 @@ pub struct JsonInvocationSystemStats {
#[derive(Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct JsonStepSystemStats {
#[serde(deserialize_with = "null_as_f64_nan")]
pub cpu_utilization_percent: f64,
}

fn null_as_f64_nan<'de, D: serde::Deserializer<'de>>(d: D) -> Result<f64, D::Error> {
use serde::Deserialize as _;
Option::<f64>::deserialize(d).map(|f| f.unwrap_or(f64::NAN))
}
Loading