Skip to content

Fix clippy warnings #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnAZoidberg merged 4 commits into from
Jan 29, 2025
Merged

Fix clippy warnings #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee11255
trivial: Turn match into question-mark
JohnAZoidberg Jan 29, 2025
f1dad52
trivial: Simplify string replace
JohnAZoidberg Jan 29, 2025
dc9ce58
trivial: Use first instead of get(0)
JohnAZoidberg Jan 29, 2025
3bca3db
framework_lib: Update num-derive to 0.3
JohnAZoidberg Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion framework_lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ clap = { version = "4.0", features = ["derive"], optional = true }
clap-verbosity-flag = { version = "2.0.1", optional = true }
nix = { version = "0.25.0", optional = true }
num = { version = "0.4", default-features = false }
num-derive = { version = "0.3", default-features = false }
num-derive = { version = "0.4", default-features = false }
num-traits = { version = "0.2", default-features = false }
env_logger = { version = "0.10.0", optional = true }
log = { version = "0.4", default-features = true }
Expand Down
6 changes: 1 addition & 5 deletions framework_lib/src/ccgx/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,7 @@ impl PdController {
buffer[params_len..params_len + msgs_len].copy_from_slice(msgs_buffer);
buffer[params_len + msgs_len..].copy_from_slice(&addr_bytes);

let data = self.send_ec_command(EcCommands::I2cPassthrough as u16, 0, &buffer);
let data = match data {
Ok(data) => data,
Err(err) => return Err(err),
};
let data = self.send_ec_command(EcCommands::I2cPassthrough as u16, 0, &buffer)?;
let res: _EcI2cPassthruResponse = unsafe { std::ptr::read(data.as_ptr() as *const _) };
let res_data = &data[size_of::<_EcI2cPassthruResponse>()..];
// TODO: Seems to be either one, non-deterministically
Expand Down
10 changes: 3 additions & 7 deletions framework_lib/src/chromium_ec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,7 @@ impl CrosEc {
pub fn read_ec_flash_chunk(&self, offset: u32, size: u32) -> EcResult<Vec<u8>> {
// TODO: Windows asserts
//assert!(size <= 0x80); // TODO: I think this is EC_LPC_HOST_PACKET_SIZE - size_of::<EcHostResponse>()
let data = EcRequestFlashRead { offset, size }.send_command_vec(self);
let data = match data {
Ok(data) => data,
Err(err) => return Err(err),
};
let data = EcRequestFlashRead { offset, size }.send_command_vec(self)?;

// TODO: Windows asserts because it returns more data
//debug_assert!(data.len() == size as usize); // Make sure we get back what was requested
Expand Down Expand Up @@ -773,7 +769,7 @@ impl CrosEc {
let utf8 = std::str::from_utf8(&data).unwrap();
let ascii = utf8
.replace(|c: char| !c.is_ascii(), "")
.replace(|c: char| c == '\0', "");
.replace(['\0'], "");

print!("{}", ascii);
console.push_str(ascii.as_str());
Expand Down Expand Up @@ -803,7 +799,7 @@ impl CrosEc {
let utf8 = std::str::from_utf8(&data).unwrap();
let ascii = utf8
.replace(|c: char| !c.is_ascii(), "")
.replace(|c: char| c == '\0', "");
.replace(['\0'], "");
Ok(ascii)
}

Expand Down
2 changes: 1 addition & 1 deletion framework_lib/src/commandline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ fn compare_version(device: Option<HardwareDeviceType>, version: String, ec: &Cro

if let Some(smbios) = get_smbios() {
let bios_entries = smbios.collect::<SMBiosInformation>();
let bios = bios_entries.get(0).unwrap();
let bios = bios_entries.first().unwrap();

if device == Some(HardwareDeviceType::BIOS) {
println!("Comparing BIOS version {:?}", bios.version().to_string());
Expand Down
2 changes: 1 addition & 1 deletion framework_lib/src/power.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ impl From<PowerInfo> for ReducedPowerInfo {

fn read_string(ec: &CrosEc, address: u16) -> String {
let bytes = ec.read_memory(address, EC_MEMMAP_TEXT_MAX).unwrap();
String::from_utf8_lossy(bytes.as_slice()).replace(|c: char| c == '\0', "")
String::from_utf8_lossy(bytes.as_slice()).replace(['\0'], "")
}

fn read_u32(ec: &CrosEc, address: u16) -> u32 {
Expand Down