1
Fork 0

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

When doing optimized build through opt-dist,
I've often run into errors like `invalid type: null, expected f64`.
This is likely because some f64 fields might actually bet set null.
Unfortunately, serde_json doesn't handle null <-> NaN well.

This commit addresses it by having a custom deserialize method, so
null is always be deserialized to `f64:NAN`.

See:

* https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/opt-dist.3A.20.60invalid.20type.3A.20null.2C.20expect.20f64.60.20failure
* https://github.com/serde-rs/json/issues/202
This commit is contained in:
Weihang Lo 2025-01-24 19:08:32 -05:00
parent 1e9b0177da
commit 5f8bcec6c8
No known key found for this signature in database
GPG key ID: D7DBF189825E82E7

View file

@ -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>,
}
@ -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,
@ -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))
}