Skip to content

Commit 1b82f74

Browse files
alanpoonalanpoon
committed
fix clippy
1 parent 8ae6afb commit 1b82f74

File tree

6 files changed

+63
-81
lines changed

6 files changed

+63
-81
lines changed

‎src/app.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ live_design! {
112112
flow: Overlay
113113
image_viewer_inner = <ImageViewer> {
114114
align: {x: 0.5, y: 0.5}
115-
debug: true
116115
padding: {bottom: 0}
117116
}
118117
image_detail = <RoomImageMessageDetail> {
@@ -453,17 +452,17 @@ impl MatchEvent for App {
453452

454453
match action.downcast_ref() {
455454
Some(ImageViewerAction::Show(load_state)) => {
456-
match &load_state {
457-
&LoadState::Loading(thumbnail_data) => {
455+
match load_state {
456+
LoadState::Loading(thumbnail_data) => {
458457
self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, true);
459458
self.ui.label(id!(image_viewer_status_label)).set_text(cx, "Loading...");
460459
self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, false);
461-
let _ = self.ui.image_viewer(id!(image_viewer_inner)).display_rotated_image(cx, &thumbnail_data);
460+
let _ = self.ui.image_viewer(id!(image_viewer_inner)).display_rotated_image(cx, thumbnail_data);
462461
}
463-
&LoadState::Loaded(image_bytes) => {
462+
LoadState::Loaded(image_bytes) => {
464463
self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, false);
465-
let _ = self.ui.image_viewer(id!(image_viewer_inner)).display_rotated_image(cx, &image_bytes);
466-
if let Err(error) = self.ui.image_viewer(id!(image_viewer_inner)).display_image(cx, &image_bytes) {
464+
let _ = self.ui.image_viewer(id!(image_viewer_inner)).display_rotated_image(cx, image_bytes);
465+
if let Err(error) = self.ui.image_viewer(id!(image_viewer_inner)).display_image(cx, image_bytes) {
467466
self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, true);
468467
let err = match error {
469468
ImageError::JpgDecode(_) | ImageError::PngDecode(_) => ImageViewerError::UnsupportedFormat,
@@ -479,7 +478,7 @@ impl MatchEvent for App {
479478
self.ui.label(id!(image_viewer_status_label)).set_text(cx, "");
480479
}
481480
}
482-
&LoadState::Error(error) => {
481+
LoadState::Error(error) => {
483482
self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, false);
484483
self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, true);
485484
self.ui.label(id!(image_viewer_status_label)).set_text(cx, image_viewer_error_to_string(error));

‎src/home/room_image_message_detail.rs‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,31 +138,28 @@ impl Widget for RoomImageMessageDetail {
138138

139139
impl MatchEvent for RoomImageMessageDetail {
140140
fn handle_action(&mut self, cx: &mut Cx, action:&Action) {
141-
match action.as_widget_action().cast() {
142-
RoomImageMessageDetailAction::SetImageDetail {
141+
if let RoomImageMessageDetailAction::SetImageDetail {
143142
room_id,
144143
sender,
145144
sender_profile,
146145
event_id,
147146
timestamp_millis,
148147
image_name,
149148
image_size
150-
} => {
151-
self.room_id = room_id.clone();
152-
self.sender = sender.clone();
153-
self.sender_profile = sender_profile.clone();
154-
self.event_id = event_id.clone();
155-
self.avatar_drawn = false;
156-
// Format and display image name and size
157-
let human_readable_size = format_file_size(image_size);
158-
let display_text = format!("{} ({})", image_name, human_readable_size);
159-
self.label(id!(image_name_and_size)).set_text(cx, &display_text);
160-
if let Some(dt) = unix_time_millis_to_datetime(timestamp_millis) {
161-
self.view(id!(timestamp_view)).set_visible(cx, true);
162-
self.timestamp(id!(timestamp)).set_date_time(cx, dt);
163-
}
149+
} = action.as_widget_action().cast() {
150+
self.room_id = room_id.clone();
151+
self.sender = sender.clone();
152+
self.sender_profile = sender_profile.clone();
153+
self.event_id = event_id.clone();
154+
self.avatar_drawn = false;
155+
// Format and display image name and size
156+
let human_readable_size = format_file_size(image_size);
157+
let display_text = format!("{} ({})", image_name, human_readable_size);
158+
self.label(id!(image_name_and_size)).set_text(cx, &display_text);
159+
if let Some(dt) = unix_time_millis_to_datetime(timestamp_millis) {
160+
self.view(id!(timestamp_view)).set_visible(cx, true);
161+
self.timestamp(id!(timestamp)).set_date_time(cx, dt);
164162
}
165-
_ => {}
166163
}
167164
}
168165
}

‎src/home/room_screen.rs‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -663,50 +663,47 @@ impl Widget for RoomScreen {
663663
);
664664
}
665665
let image_widget_uid = wr.image(id!(content.message)).widget_uid();
666-
match actions.find_widget_action(image_widget_uid).cast() {
667-
TextOrImageAction::Clicked(_mxc_uri) => {
668-
if let Some(tl_state) = &self.tl_state {
669-
if let Some(item) = tl_state.items.get(index) {
670-
if let Some(event_tl_item) = item.as_event() {
671-
let sender_profile = event_tl_item.sender_profile();
672-
let sender = event_tl_item.sender();
673-
let event_id = event_tl_item.event_id().map(|id| id.to_owned());
674-
let timestamp = event_tl_item.timestamp();
675-
676-
// Extract image name and size from the message content
677-
let (image_name, image_size) = if let Some(message) = event_tl_item.content().as_message() {
678-
if let MessageType::Image(image_content) = message.msgtype() {
679-
let name = message.body().to_string();
680-
let size = image_content.info.as_ref()
681-
.and_then(|info| info.size)
682-
.map(|s| i32::try_from(s).unwrap_or_default())
683-
.unwrap_or(0);
684-
(name, size)
685-
} else {
686-
("Unknown Image".to_string(), 0)
687-
}
666+
if let TextOrImageAction::Clicked(_mxc_uri) = actions.find_widget_action(image_widget_uid).cast() {
667+
if let Some(tl_state) = &self.tl_state {
668+
if let Some(item) = tl_state.items.get(index) {
669+
if let Some(event_tl_item) = item.as_event() {
670+
let sender_profile = event_tl_item.sender_profile();
671+
let sender = event_tl_item.sender();
672+
let event_id = event_tl_item.event_id().map(|id| id.to_owned());
673+
let timestamp = event_tl_item.timestamp();
674+
675+
// Extract image name and size from the message content
676+
let (image_name, image_size) = if let Some(message) = event_tl_item.content().as_message() {
677+
if let MessageType::Image(image_content) = message.msgtype() {
678+
let name = message.body().to_string();
679+
let size = image_content.info.as_ref()
680+
.and_then(|info| info.size)
681+
.map(|s| i32::try_from(s).unwrap_or_default())
682+
.unwrap_or(0);
683+
(name, size)
688684
} else {
689685
("Unknown Image".to_string(), 0)
690-
};
691-
692-
cx.widget_action(
693-
room_screen_widget_uid,
694-
&scope.path,
695-
RoomImageMessageDetailAction::SetImageDetail {
696-
room_id: self.room_id.clone(),
697-
sender: Some(sender.to_owned()),
698-
sender_profile: Some(sender_profile.clone()),
699-
event_id,
700-
timestamp_millis: timestamp,
701-
image_name,
702-
image_size
703-
}
704-
);
705-
}
686+
}
687+
} else {
688+
("Unknown Image".to_string(), 0)
689+
};
690+
691+
cx.widget_action(
692+
room_screen_widget_uid,
693+
&scope.path,
694+
RoomImageMessageDetailAction::SetImageDetail {
695+
room_id: self.room_id.clone(),
696+
sender: Some(sender.to_owned()),
697+
sender_profile: Some(sender_profile.clone()),
698+
event_id,
699+
timestamp_millis: timestamp,
700+
image_name,
701+
image_size
702+
}
703+
);
706704
}
707705
}
708706
}
709-
_ => {}
710707
}
711708
}
712709

‎src/media_cache.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ fn error_to_media_cache_entry(e: Error, request: &MediaRequestParameters) -> Med
210210
Error::Http(http_error) => {
211211
if let Some(client_error) = http_error.as_client_api_error() {
212212
error!("Client error for media cache: {client_error} for request: {:?}", request);
213-
MediaCacheEntry::Failed(client_error.status_code.clone())
213+
MediaCacheEntry::Failed(client_error.status_code)
214214
} else {
215215
match *http_error {
216216
HttpError::Reqwest(reqwest_error) => {

‎src/shared/image_viewer.rs‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,9 @@ live_design! {
114114
align: {x: 0.5, y: 0.5}
115115
show_bg: true
116116
draw_bg: {
117-
//color: #000
118117
color: #ffffff
119118
}
120119
flow: Down
121-
debug: false
122120
header = <View> {
123121
width: Fill, height: 50
124122
flow: Right
@@ -185,13 +183,7 @@ live_design! {
185183
rotated_image_container = <View> {
186184
width: Fill, height: Fill,
187185
flow: Overlay
188-
show_bg: false
189-
draw_bg: {
190-
color: #FF0000
191-
//color: #ffffff
192-
}
193186
align: {x: 0.5, y: 0.5}
194-
debug: true
195187
rotated_image = <RotatedImage> {
196188
width: Fill, height: Fill,
197189
draw_bg: {
@@ -443,11 +435,8 @@ impl MatchEvent for ImageViewer {
443435
}
444436

445437
for action in actions {
446-
match action.downcast_ref::<ImageViewerAction>() {
447-
Some(ImageViewerAction::Hide) => {
448-
self.reset(cx);
449-
}
450-
_ => {}
438+
if let Some(ImageViewerAction::Hide) = action.downcast_ref::<ImageViewerAction>() {
439+
self.reset(cx);
451440
}
452441
}
453442
}

‎src/utils.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub fn load_png_or_jpg(img: &ImageRef, cx: &mut Cx, data: &[u8]) -> Result<(), I
141141
pub fn load_png_or_jpg_rotated_image(img: &RotatedImageRef, cx: &mut Cx, data: &[u8]) -> Result<(), ImageError> {
142142
fn retain_aspect_ratio(width: u32, height: u32) -> (f32, f32) {
143143
let aspect_ratio: f32 = width as f32 / height as f32;
144-
let (mut capped_width, mut capped_height) = (width as u32, height as u32);
144+
let (mut capped_width, mut capped_height) = (width, height);
145145
if capped_height > ROTATED_IMAGE_MAX_SIZE {
146146
capped_height = ROTATED_IMAGE_MAX_SIZE;
147147
capped_width = (capped_height as f32 * aspect_ratio).floor() as u32;
@@ -189,7 +189,7 @@ pub fn load_png_or_jpg_rotated_image(img: &RotatedImageRef, cx: &mut Cx, data: &
189189
///
190190
/// Returns an error if the image fails to load or if the format is unsupported.
191191
pub fn create_texture_from_jpg_data(cx: &mut Cx, data: &[u8]) -> Result<Texture, ImageError> {
192-
match ImageBuffer::from_jpg(&*data) {
192+
match ImageBuffer::from_jpg(data) {
193193
Ok(image_buffer) => {
194194
println!("image_buffer height {:?}, width {:?}", image_buffer.height,image_buffer.width);
195195
Ok(image_buffer.into_new_texture(cx))
@@ -204,7 +204,7 @@ pub fn create_texture_from_jpg_data(cx: &mut Cx, data: &[u8]) -> Result<Texture,
204204
///
205205
/// Returns an error if the image fails to load or if the format is unsupported.
206206
pub fn create_texture_from_png_data(cx: &mut Cx, data: &[u8]) -> Result<Texture, ImageError> {
207-
match ImageBuffer::from_png(&*data) {
207+
match ImageBuffer::from_png(data) {
208208
Ok(image_buffer) => {
209209
Ok(image_buffer.into_new_texture(cx))
210210
}

0 commit comments

Comments
 (0)