WIP - integration - clippy fixes

cepetr/drawlib-integration
cepetr 2 months ago
parent 1b72542259
commit 320aca2ab2

@ -125,7 +125,7 @@ impl Marquee {
}
pub fn render_anim<'s>(&'s self, target: &mut impl Renderer<'s>, offset: i16) {
target.in_window(self.area, &mut |target| {
target.in_window(self.area, &|target| {
let text_height = self.font.text_height();
let pos = self.area.top_left() + Offset::new(offset, text_height - 1);
self.text.map(|t| {

@ -56,8 +56,7 @@ pub fn jpeg_info(data: &[u8]) -> Option<(Offset, i16)> {
let read_u16 = |ofs| -> Option<u16> {
if ofs + 1 < data.len() {
let result = Some(((data[ofs] as u16) << 8) + data[ofs + 1] as u16);
result
Some(((data[ofs] as u16) << 8) + data[ofs + 1] as u16)
} else {
None
}
@ -65,8 +64,7 @@ pub fn jpeg_info(data: &[u8]) -> Option<(Offset, i16)> {
let read_u8 = |ofs| -> Option<u8> {
if ofs < data.len() {
let result = Some(data[ofs]);
result
Some(data[ofs])
} else {
None
}

@ -453,5 +453,4 @@ impl UIFeaturesBootloader for ModelTRFeatures {
}
});
}
}

@ -113,7 +113,7 @@ where
fn render_left<'s>(&'s self, target: &mut impl Renderer<'s>) {
let baseline = Point::new(self.pad.area.x0, self.y_baseline());
shape::Text::new(baseline, &self.text.as_ref())
shape::Text::new(baseline, self.text.as_ref())
.with_font(self.font)
.render(target);
}
@ -125,7 +125,7 @@ where
fn render_center<'s>(&'s self, target: &mut impl Renderer<'s>) {
let baseline = Point::new(self.pad.area.bottom_center().x, self.y_baseline());
shape::Text::new(baseline, &self.text.as_ref())
shape::Text::new(baseline, self.text.as_ref())
.with_align(Alignment::Center)
.with_font(self.font)
.render(target);
@ -138,7 +138,7 @@ where
fn render_right<'s>(&'s self, target: &mut impl Renderer<'s>) {
let baseline = Point::new(self.pad.area.x1, self.y_baseline());
shape::Text::new(baseline, &self.text.as_ref())
shape::Text::new(baseline, self.text.as_ref())
.with_align(Alignment::End)
.with_font(self.font)
.render(target);

@ -216,10 +216,7 @@ impl<'a> ComponentMsgObj for Lockscreen<'a> {
}
}
impl<'a, F> ComponentMsgObj for ConfirmHomescreen<F>
where
F: Fn() -> &'a [u8],
{
impl<'a> ComponentMsgObj for ConfirmHomescreen {
fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
match msg {
CancelConfirmMsg::Confirmed => Ok(CONFIRMED.as_obj()),

@ -472,5 +472,4 @@ impl UIFeaturesBootloader for ModelTTFeatures {
}
});
}
}

@ -16,7 +16,10 @@ const ICON_TOP_MARGIN: i16 = 48;
#[cfg(not(feature = "bootloader"))]
const MODEL_NAME_FONT: display::Font = display::Font::DEMIBOLD;
#[cfg(not(feature = "bootloader"))]
use crate::{trezorhal::model, ui::{display, geometry::Alignment}};
use crate::{
trezorhal::model,
ui::{display, geometry::Alignment},
};
pub struct WelcomeScreen {
area: Rect,

@ -624,7 +624,7 @@ extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *m
jpeg = ImageBuffer::from_slice(theme::IMAGE_HOMESCREEN);
}
if let None = jpeg_info(jpeg.data()) {
if jpeg_info(jpeg.data()).is_none() {
return Err(value_error!("Invalid image."));
};

Loading…
Cancel
Save