From 2332b507b2f4f78d0cc555fa733125a751556fd6 Mon Sep 17 00:00:00 2001 From: ju6ge Date: Wed, 25 Mar 2026 14:37:31 +0100 Subject: [PATCH] Replace u32::from with .into() for idiomatic Rust --- lib-bms-protocol/src/lib.rs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib-bms-protocol/src/lib.rs b/lib-bms-protocol/src/lib.rs index 8e13811..d696386 100644 --- a/lib-bms-protocol/src/lib.rs +++ b/lib-bms-protocol/src/lib.rs @@ -87,7 +87,7 @@ impl BmsReadable for ProtocolVersion { ], )?; let transit = Transit_U26::from_be_bytes(version)?; - Ok(ProtocolVersion(u32::from(transit))) + Ok(ProtocolVersion(transit.into())) } } @@ -111,7 +111,7 @@ impl BmsReadable for FirmwareVersion { ], )?; let transit = Transit_U26::from_be_bytes(version)?; - Ok(FirmwareVersion(u32::from(transit))) + Ok(FirmwareVersion(transit.into())) } } @@ -142,9 +142,9 @@ impl BmsReadable for Config { ], )?; Ok(Config { - capacity_mah: u32::from(Transit_U26::from_be_bytes(capacity_mah)?), - v_full_mv: u32::from(Transit_U26::from_be_bytes(v_full_mv)?), - v_empty_mv: u32::from(Transit_U26::from_be_bytes(v_empty_mv)?), + capacity_mah: Transit_U26::from_be_bytes(capacity_mah)?.into(), + v_full_mv: Transit_U26::from_be_bytes(v_full_mv)?.into(), + v_empty_mv: Transit_U26::from_be_bytes(v_empty_mv)?.into(), }) } } @@ -182,11 +182,11 @@ impl BmsReadable for BatteryState { ], )?; Ok(BatteryState { - lifetime_capacity_mah: u32::from(Transit_U26::from_be_bytes(lifetime_capacity_mah)?), - remaining_capacity_mah: u32::from(Transit_U26::from_be_bytes(remaining_capacity_mah)?), - current_mv: u32::from(Transit_U26::from_be_bytes(current_mv)?), + lifetime_capacity_mah: Transit_U26::from_be_bytes(lifetime_capacity_mah)?.into(), + remaining_capacity_mah: Transit_U26::from_be_bytes(remaining_capacity_mah)?.into(), + current_mv: Transit_U26::from_be_bytes(current_mv)?.into(), temperature_celcius: i32::from_be_bytes(temperature_celcius), - health_percent: u32::from(Transit_U26::from_be_bytes(health_percent)?), + health_percent: Transit_U26::from_be_bytes(health_percent)?.into(), }) } } @@ -209,9 +209,9 @@ impl BmsReadable for ChargeInfoWindowSec { Operation::Read(&mut charge_info_window_sec), ], )?; - Ok(ChargeInfoWindowSec(u32::from(Transit_U26::from_be_bytes( - charge_info_window_sec, - )?))) + Ok(ChargeInfoWindowSec( + Transit_U26::from_be_bytes(charge_info_window_sec)?.into(), + )) } } @@ -266,11 +266,11 @@ impl BmsReadable for ChargeInfo { ], )?; Ok(ChargeInfo { - total_charge_ma: u32::from(Transit_U26::from_be_bytes(total_charge_ma)?), - total_discharge_ma: u32::from(Transit_U26::from_be_bytes(total_discharge_ma)?), - max_charge_mw: u32::from(Transit_U26::from_be_bytes(max_charge_mw)?), - max_discharge_mw: u32::from(Transit_U26::from_be_bytes(max_discharge_mw)?), - avg_voltage_mv: u32::from(Transit_U26::from_be_bytes(avg_voltage_mv)?), + total_charge_ma: Transit_U26::from_be_bytes(total_charge_ma)?.into(), + total_discharge_ma: Transit_U26::from_be_bytes(total_discharge_ma)?.into(), + max_charge_mw: Transit_U26::from_be_bytes(max_charge_mw)?.into(), + max_discharge_mw: Transit_U26::from_be_bytes(max_discharge_mw)?.into(), + avg_voltage_mv: Transit_U26::from_be_bytes(avg_voltage_mv)?.into(), }) } }