clippy improvement

Author: alanpoon

src/app.rs

@@ -687,7 +687,9 @@ impl App {
 
     /// Handles actions for the image viewer.
     /// Returns a boolean, is true continues the actions for loop.
-    fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Box<dyn ActionTrait>) -> bool {
+    //fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Box<dyn ActionTrait>) -> bool {
+    fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Action) -> bool {
+
         match action.downcast_ref() {
             Some(ImageViewerAction::Show(load_state)) => {
                 match load_state {

src/home/room_screen.rs

@@ -665,7 +665,7 @@ impl Widget for RoomScreen {
                 let content_message = wr.text_or_image(ids!(content.message));
                 if let TextOrImageAction::Clicked(mxc_uri) = actions.find_widget_action(content_message.widget_uid()).cast() {
                     let Some((texture, size)) = content_message.get_texture_and_size(cx) else { continue; };
-                    let texture = Arc::new(texture);
+                    let texture = std::rc::Rc::new(texture);
                     let screen_width = wr.area().rect(cx).size.x;
                     let (capped_width, capped_height) = constrain_image_dimensions(size.x, size.y, screen_width);
                     if let Some(tl_state) = &mut self.tl_state {
@@ -721,7 +721,7 @@ impl Widget for RoomScreen {
                         };
                         let screen_width = wr.area().rect(cx).size.x;
                         let (capped_width, capped_height) = constrain_image_dimensions(size.x, size.y, screen_width);
-                        let texture = Arc::new(texture);
+                        let texture = std::rc::Rc::new(texture);
                         let Some(mxc_uri_string) = mxc_uri else { continue; };
                         let mxc_uri = OwnedMxcUri::from(mxc_uri_string);
                         cx.action(ImageViewerAction::Show(LoadState::Loading(texture, DVec2 { x: capped_width, y: capped_height })));

src/shared/image_viewer.rs

@@ -443,28 +443,30 @@ impl Widget for ImageViewer {
         if let Event::Signal = event {
             let mut to_remove = false;
             if let Some((_background_task_id, receiver)) = &mut self.receiver {
-                while let Ok(image_buffer_res) = receiver.try_recv() {
-                    match image_buffer_res {
-                        Ok(image_buffer) => {
-                            let rotated_image = self.view.rotated_image(ids!(rotated_image));
-                            let texture = image_buffer.into_new_texture(cx);
-                            rotated_image.set_texture(cx, Some(texture));
-                            to_remove = true;
-                            cx.action(ImageViewerAction::Show(LoadState::FinishedBackgroundDecoding));
-                        
-                        }
-                        Err(error) => {
-                            let error = match error {
-                                ImageError::JpgDecode(_) | ImageError::PngDecode(_) => ImageViewerError::UnsupportedFormat,
-                                ImageError::EmptyData => ImageViewerError::BadData,
-                                ImageError::PathNotFound(_) => ImageViewerError::NotFound,
-                                ImageError::UnsupportedFormat => ImageViewerError::UnsupportedFormat,
-                                _ => ImageViewerError::BadData,
-                            };
-                            cx.action(ImageViewerAction::Show(LoadState::Error(error)));
+                match receiver.try_recv() {
+                    Ok(image_buffer_res) => {
+                        match image_buffer_res {
+                            Ok(image_buffer) => {
+                                let rotated_image = self.view.rotated_image(ids!(rotated_image));
+                                let texture = image_buffer.into_new_texture(cx);
+                                rotated_image.set_texture(cx, Some(texture));
+                                to_remove = true;
+                                cx.action(ImageViewerAction::Show(LoadState::FinishedBackgroundDecoding));
+                            
+                            }
+                            Err(error) => {
+                                let error = match error {
+                                    ImageError::JpgDecode(_) | ImageError::PngDecode(_) => ImageViewerError::UnsupportedFormat,
+                                    ImageError::EmptyData => ImageViewerError::BadData,
+                                    ImageError::PathNotFound(_) => ImageViewerError::NotFound,
+                                    ImageError::UnsupportedFormat => ImageViewerError::UnsupportedFormat,
+                                    _ => ImageViewerError::BadData,
+                                };
+                                cx.action(ImageViewerAction::Show(LoadState::Error(error)));
+                            }
                         }
                     }
-                    break
+                    Err(_) => {}
                 }
             }
             if to_remove {
@@ -729,7 +731,7 @@ impl ImageViewerRef {
 pub enum LoadState {
     /// The image is currently being loaded with its loading image texture and its image size.
     /// This texture is usually the image texture that's being selected.
-    Loading(Arc<Option<Texture>>, DVec2),
+    Loading(std::rc::Rc<Option<Texture>>, DVec2),
     /// The image has been successfully loaded given the data.
     Loaded(Arc<[u8]>),
     /// The image has been loaded from background thread.