From 71686757ec7acd01178957258989b5010c9ee9f1 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 20:09:03 -0800 Subject: [PATCH] Unit Converter: a null unit is an error addon.units.convert read {"value": 12, "unit": null} as 12 points. Only an omitted unit is points now; a null unit is refused as an unknown unit. --- crates/engine/src/cmd/addons/units.rs | 4 ++-- crates/engine/src/cmd/addons/units/tests.rs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/engine/src/cmd/addons/units.rs b/crates/engine/src/cmd/addons/units.rs index 5d362a0acb..b5d844709a 100644 --- a/crates/engine/src/cmd/addons/units.rs +++ b/crates/engine/src/cmd/addons/units.rs @@ -57,9 +57,9 @@ pub fn in_every_unit(pt: f64) -> Value { json!({ "points": pt, "units": units }) } -/// The unit `p` gives for a number without a suffix (points when left out). +/// The unit `p` gives for a number without a suffix (points when left out; null is an error). fn unit_param(p: &Value) -> Result { - let Some(given) = p.get("unit").filter(|u| !u.is_null()) else { return Ok(Unit::Points) }; + let Some(given) = p.get("unit") else { return Ok(Unit::Points) }; let named = given.as_str().filter(|name| name.len() <= MAX_TEXT_LEN).and_then(Unit::named_east_asian); named.ok_or_else(|| { let u = match given { diff --git a/crates/engine/src/cmd/addons/units/tests.rs b/crates/engine/src/cmd/addons/units/tests.rs index 8ab0bd8984..1216a1ca0b 100644 --- a/crates/engine/src/cmd/addons/units/tests.rs +++ b/crates/engine/src/cmd/addons/units/tests.rs @@ -155,6 +155,8 @@ fn bad_values_and_units_are_refused() { json!({"value": 1, "unit": "furlongs"}), json!({"value": 1, "unit": 5}), json!({"value": 1, "unit": ["mm"]}), + // Only an omitted `unit` is points. + json!({"value": 1, "unit": null}), ] { match s.execute("addon.units.convert", &p) { Err(EngineError::BadParams { cmd, .. }) => assert_eq!(cmd, "addon.units.convert", "{p}"),