From 81ebf9968373e18a25ed772e2aa3b5d00d012d19 Mon Sep 17 00:00:00 2001 From: Benign X <1341398182@qq.com> Date: Wed, 6 Mar 2024 02:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=A0=EF=B8=8F(icu=5Flib):=20fix=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- icu_lib/src/endecoder/lvgl_v9/lvgl.rs | 4 +--- icu_lib/src/endecoder/lvgl_v9/mod.rs | 20 +++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/icu_lib/src/endecoder/lvgl_v9/lvgl.rs b/icu_lib/src/endecoder/lvgl_v9/lvgl.rs index 8d9a3c9..1991854 100644 --- a/icu_lib/src/endecoder/lvgl_v9/lvgl.rs +++ b/icu_lib/src/endecoder/lvgl_v9/lvgl.rs @@ -1,7 +1,5 @@ use crate::endecoder::lvgl_v9::color_converter::{rgba8888_from, rgba8888_to}; -use crate::endecoder::lvgl_v9::{ - ColorFormat, Flags, ImageDescriptor, ImageHeader, LVGLVersion, LVGL, -}; +use crate::endecoder::lvgl_v9::{Flags, ImageDescriptor, ImageHeader, LVGLVersion, LVGL}; use crate::endecoder::{EnDecoder, ImageInfo}; use crate::midata::MiData; use crate::EncoderParams; diff --git a/icu_lib/src/endecoder/lvgl_v9/mod.rs b/icu_lib/src/endecoder/lvgl_v9/mod.rs index 531c23d..6e9cfc8 100644 --- a/icu_lib/src/endecoder/lvgl_v9/mod.rs +++ b/icu_lib/src/endecoder/lvgl_v9/mod.rs @@ -1,5 +1,5 @@ use modular_bitfield::prelude::*; -use std::io::{Bytes, Cursor, Read, Write}; +use std::io::{Cursor, Write}; mod color_converter; mod lvgl; @@ -8,7 +8,7 @@ mod lvgl; #[bits = 8] #[derive(Debug, Copy, Clone, PartialEq, Default)] #[repr(u8)] -pub(crate) enum LVGLVersion { +pub enum LVGLVersion { #[default] Unknown, @@ -90,10 +90,12 @@ pub struct ImageHeaderV8 { #[repr(C, packed)] pub struct ImageHeaderV9 { // Magic number. Must be LV_IMAGE_HEADER_MAGIC - magic: u8, + #[allow(unused)] + magic: B8, // Color format: See `lv_color_format_t` cf: ColorFormat, // Image flags, see `lv_image_flags_t` + #[allow(unused)] flags: Flags, // Width of the image in pixels @@ -126,7 +128,7 @@ impl ImageHeader { version = LVGLVersion::V8; } - let header = match version { + match version { LVGLVersion::V8 => { let header = ImageHeaderV8::from_bytes([data[0], data[1], data[2], data[3]]); log::trace!("Decoded image header: {:#?}", header); @@ -152,9 +154,7 @@ impl ImageHeader { } } _ => ImageHeader::Unknown, - }; - - header + } } pub fn into_bytes(&self) -> Vec { @@ -223,7 +223,7 @@ impl ImageHeader { h: u16, stride: u16, ) -> Self { - let header = match version { + match version { LVGLVersion::V8 => { ImageHeader::V8(ImageHeaderV8::new().with_cf(cf).with_w(w).with_h(h)) } @@ -237,9 +237,7 @@ impl ImageHeader { .with_stride(stride), ), LVGLVersion::Unknown => ImageHeader::Unknown, - }; - - header + } } pub fn encode(&self) -> Vec {