From 4d34027a01be2000baec802a2f2e8901304b3e4a Mon Sep 17 00:00:00 2001 From: neithanmo Date: Mon, 23 Dec 2024 13:01:47 -0600 Subject: [PATCH] Make clippy happy --- app/rust/src/lib.rs | 9 ++++----- app/rust/src/parser/consent_message/msg.rs | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/rust/src/lib.rs b/app/rust/src/lib.rs index f68a43d4..a00891fb 100644 --- a/app/rust/src/lib.rs +++ b/app/rust/src/lib.rs @@ -43,14 +43,13 @@ pub fn zlog(_msg: &str) { std::println!("{}", _msg); } -#[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))] pub fn check_canary() { - unsafe { _check_canary() } + #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))] + unsafe { + _check_canary() + } } -#[cfg(test)] -pub fn check_canary() {} - extern "C" { fn zemu_log_stack(s: *const u8); fn _check_canary(); diff --git a/app/rust/src/parser/consent_message/msg.rs b/app/rust/src/parser/consent_message/msg.rs index dc174e81..84e30d7e 100644 --- a/app/rust/src/parser/consent_message/msg.rs +++ b/app/rust/src/parser/consent_message/msg.rs @@ -357,7 +357,6 @@ impl<'a, const PAGES: usize, const LINES: usize> DisplayableItem #[cfg(test)] mod tests_msg_display { use super::*; - use std::string::String; const SCREEN_WIDTH: usize = 35; const SMALL_SCREEN_WIDTH: usize = 15;