Skip to content

Commit 63441d3

Browse files
committed
Fix some more clippy lints
Signed-off-by: Daniel Schaefer <dhs@frame.work>
1 parent a80b6dd commit 63441d3

5 files changed

Lines changed: 7 additions & 8 deletions

File tree

framework_lib/src/ccgx/binary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ fn read_version(
150150
unsafe { std::ptr::read(data[0..version_len].as_ptr() as *const _) };
151151

152152
let base_version = BaseVersion::from(version_info.base_version);
153-
let app_version = AppVersion::try_from(version_info.app_version).ok()?;
153+
let app_version = AppVersion::from(version_info.app_version);
154154

155155
let fw_silicon_id = version_info.silicon_id;
156156
let fw_silicon_family = version_info.silicon_family;

framework_lib/src/ccgx/device.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use core::prelude::rust_2021::derive;
1111

1212
use crate::ccgx::{AppVersion, BaseVersion, ControllerVersion};
1313
use crate::chromium_ec::command::EcCommands;
14-
use crate::chromium_ec::{CrosEc, CrosEcDriver, EcError, EcResponseStatus, EcResult};
14+
use crate::chromium_ec::{CrosEc, CrosEcDriver, EcError, EcResult};
1515
use crate::util::{self, assert_win_len, Config, Platform};
1616
use std::mem::size_of;
1717

@@ -299,8 +299,7 @@ impl PdController {
299299
let data = self.ccgx_read(register, 8)?;
300300
Ok(ControllerVersion {
301301
base: BaseVersion::from(&data[..4]),
302-
app: AppVersion::try_from(&data[4..])
303-
.or(Err(EcError::Response(EcResponseStatus::InvalidResponse)))?,
302+
app: AppVersion::from(&data[4..]),
304303
})
305304
}
306305

framework_lib/src/commandline/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ fn print_versions(ec: &CrosEc) {
292292
println!("UEFI BIOS");
293293
if let Some(smbios) = get_smbios() {
294294
let bios_entries = smbios.collect::<SMBiosInformation>();
295-
let bios = bios_entries.get(0).unwrap();
295+
let bios = bios_entries.first().unwrap();
296296
println!(" Version: {}", bios.version());
297297
println!(" Release Date: {}", bios.release_date());
298298
}

framework_lib/src/smbios.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pub fn get_smbios() -> Option<SMBiosData> {
124124
// Get the SMBIOS entrypoint address from the kernel environment
125125
let addr_hex = kenv_get("hint.smbios.0.mem").ok()?;
126126
let addr_hex = addr_hex.trim_start_matches("0x");
127-
let addr = u64::from_str_radix(&addr_hex, 16).unwrap();
127+
let addr = u64::from_str_radix(addr_hex, 16).unwrap();
128128
trace!("SMBIOS Entrypoint Addr: {} 0x{:x}", addr_hex, addr);
129129

130130
let mut dev_mem = std::fs::File::open("/dev/mem").ok()?;

framework_lib/src/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ pub unsafe fn any_as_mut_u8_slice<T: Sized>(p: &mut T) -> &mut [u8] {
104104

105105
/// Convert an array/slice of any type to a u8 slice (Like a C byte buffer)
106106
pub unsafe fn any_vec_as_u8_slice<T: Sized>(p: &[T]) -> &[u8] {
107-
let len = ::std::mem::size_of::<T>() * p.len();
108-
::std::slice::from_raw_parts((p.as_ptr() as *const T) as *const u8, len)
107+
let len = ::std::mem::size_of_val(p);
108+
::std::slice::from_raw_parts(p.as_ptr() as *const u8, len)
109109
}
110110

111111
/// Print a byte buffer as a series of hex bytes

0 commit comments

Comments
 (0)