From 1d9efeb92baae800d22c8c22fad401c2c1f3b1c9 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Wed, 29 Jan 2025 10:28:42 +0000 Subject: [PATCH] runtime-rs: Remove use of legacy constants Fix clippy error ``` error: usage of a legacy numeric constant ``` by swapping `std::u8::MAX` for `u8::MAX` Signed-off-by: stevenhorsman --- src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs | 5 ++--- src/runtime-rs/crates/hypervisor/src/device/util.rs | 2 +- src/runtime-rs/crates/resource/src/network/network_pair.rs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs b/src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs index fa8dfded49..e830ce39d8 100644 --- a/src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs +++ b/src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs @@ -1653,7 +1653,6 @@ mod tests { result: Result, } - let u8_max = std::u8::MAX; let sysinfo = nix::sys::sysinfo::sysinfo().unwrap(); let actual_max_mem_bytes = sysinfo.ram_total(); @@ -1679,8 +1678,8 @@ mod tests { let valid_vsock = VsockConfig::try_from((vsock_socket_path.to_string(), DEFAULT_VSOCK_CID)).unwrap(); - let (cpu_info, cpus_config) = make_cpu_objects(7, u8_max, false); - let (cpu_info_tdx, cpus_config_tdx) = make_cpu_objects(7, u8_max, true); + let (cpu_info, cpus_config) = make_cpu_objects(7, u8::MAX, false); + let (cpu_info_tdx, cpus_config_tdx) = make_cpu_objects(7, u8::MAX, true); let (memory_info_std, mem_config_std) = make_memory_objects(79, usable_max_mem_bytes, false); diff --git a/src/runtime-rs/crates/hypervisor/src/device/util.rs b/src/runtime-rs/crates/hypervisor/src/device/util.rs index d719fb9e31..ca2bc38c17 100644 --- a/src/runtime-rs/crates/hypervisor/src/device/util.rs +++ b/src/runtime-rs/crates/hypervisor/src/device/util.rs @@ -138,7 +138,7 @@ mod tests { assert!(do_decrease_count(ref_count_3).unwrap()); // Third, ref_count is MAX - let mut max_count = std::u64::MAX; + let mut max_count = u64::MAX; let ref_count_max: &mut u64 = &mut max_count; assert!(do_increase_count(ref_count_max).is_err()); } diff --git a/src/runtime-rs/crates/resource/src/network/network_pair.rs b/src/runtime-rs/crates/resource/src/network/network_pair.rs index bfb0623fe6..7da02682ce 100644 --- a/src/runtime-rs/crates/resource/src/network/network_pair.rs +++ b/src/runtime-rs/crates/resource/src/network/network_pair.rs @@ -4,7 +4,7 @@ // SPDX-License-Identifier: Apache-2.0 // -use std::{convert::TryFrom, sync::Arc, usize}; +use std::{convert::TryFrom, sync::Arc}; use anyhow::{anyhow, Context, Result}; use futures::stream::TryStreamExt;