Merge pull request #20 from Waradu/warnings

Clippy warnings

Author: alii

src/discord/src/channel/mod.rs

@@ -60,7 +60,7 @@ impl Channel for DiscordChannel {
 impl Clone for DiscordChannel {
   fn clone(&self) -> Self {
     Self {
-      channel_id: self.channel_id.clone(),
+      channel_id: self.channel_id,
       receiver: self.receiver.resubscribe(),
       client: self.client.clone(),
     }

src/discord/src/message/mod.rs

@@ -37,6 +37,6 @@ impl Message for DiscordMessage {
   fn should_group(&self, previous: &Self) -> bool {
     const MAX_DISCORD_MESSAGE_GAP_SECS_FOR_GROUP: i64 = 5 * 60;
 
-    self.creation_time.signed_duration_since(&*previous.creation_time).num_seconds() <= MAX_DISCORD_MESSAGE_GAP_SECS_FOR_GROUP
+    self.creation_time.signed_duration_since(*previous.creation_time).num_seconds() <= MAX_DISCORD_MESSAGE_GAP_SECS_FOR_GROUP
   }
 }

src/discord/src/snowflake.rs

@@ -3,6 +3,7 @@ pub struct Snowflake {
   pub content: u64,
 }
 
+#[allow(clippy::to_string_trait_impl)]
 impl ToString for Snowflake {
   fn to_string(&self) -> String {
     self.content.to_string()

src/ui/src/channel/message.rs

@@ -11,8 +11,8 @@ impl<M: Message> MessageGroup<M> {
     MessageGroup { contents: vec![message] }
   }
 
-  pub fn get_author<'s>(&'s self) -> &'s (impl MessageAuthor + 's) {
-    self.contents.get(0).unwrap().get_author()
+  pub fn get_author(&self) -> &(impl MessageAuthor + '_) {
+    self.contents.first().unwrap().get_author()
   }
 
   pub fn add(&mut self, message: M) {
@@ -24,7 +24,7 @@ impl<M: Message> MessageGroup<M> {
     self.contents.push(message);
   }
 
-  pub fn contents<'s>(&'s self) -> impl IntoIterator<Item = impl Element + 's> {
+  pub fn contents(&self) -> impl IntoIterator<Item = impl Element + '_> {
     self.contents.iter().map(|v| v.get_content())
   }
 
@@ -35,7 +35,7 @@ impl<M: Message> MessageGroup<M> {
       }
     }
 
-    return None;
+    None
   }
 
   pub fn size(&self) -> usize {

src/ui/src/channel/message_list.rs

@@ -9,6 +9,12 @@ pub struct MessageList<M: Message + 'static> {
   messages: Vec<MessageGroup<M>>,
 }
 
+impl<M: Message> Default for MessageList<M> {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl<M: Message> MessageList<M> {
   pub fn new() -> MessageList<M> {
     Self { messages: Vec::default() }
@@ -37,24 +43,24 @@ impl<M: Message> MessageList<M> {
 
     let last = self.messages.last_mut();
 
-    if last.is_some()
-      && last.as_ref().unwrap().get_author().get_id() == message.get_author().get_id()
-      && message.should_group(last.as_ref().unwrap().last())
-    {
-      last.unwrap().add(message);
+    if let Some(last_group) = last {
+      if last_group.get_author().get_id() == message.get_author().get_id() && message.should_group(last_group.last()) {
+        last_group.add(message);
+      } else {
+        self.messages.push(MessageGroup::new(message));
+      }
     } else {
       self.messages.push(MessageGroup::new(message));
     }
   }
 
   pub fn add_pending_message(&mut self, pending_message: M) {
-    let last = self.messages.last_mut();
-
-    if last.is_some()
-      && last.as_ref().unwrap().get_author().get_id() == pending_message.get_author().get_id()
-      && pending_message.should_group(last.as_ref().unwrap().last())
-    {
-      last.unwrap().add(pending_message);
+    if let Some(last) = self.messages.last_mut() {
+      if last.get_author().get_id() == pending_message.get_author().get_id() && pending_message.should_group(last.last()) {
+        last.add(pending_message);
+      } else {
+        self.messages.push(MessageGroup::new(pending_message));
+      }
     } else {
       self.messages.push(MessageGroup::new(pending_message));
     }

src/ui/src/channel/mod.rs

@@ -52,8 +52,8 @@ impl<M: Message + 'static> ChannelView<M> {
     });
 
     ctx
-      .subscribe(&message_input, move |channel_view, text_input, input_event, ctx| match input_event {
-        InputEvent::PressEnter => {
+      .subscribe(&message_input, move |channel_view, text_input, input_event, ctx| {
+        if let InputEvent::PressEnter = input_event {
           let content = text_input.read(ctx).text().to_string();
           let channel_sender = channel.clone();
 
@@ -70,7 +70,6 @@ impl<M: Message + 'static> ChannelView<M> {
           channel_view.list_state = channel_view.list_model.read(ctx).create_list_state();
           ctx.notify();
         }
-        _ => {}
       })
       .detach();
 

src/ui/src/main.rs

@@ -2,7 +2,7 @@ pub mod app;
 pub mod app_state;
 pub mod channel;
 
-use std::{fs, path::PathBuf, sync::Arc};
+use std::sync::Arc;
 
 use app_state::AppState;
 use components::theme::Theme;
@@ -59,6 +59,6 @@ async fn main() {
       ..Default::default()
     };
 
-    cx.open_window(opts, |cx| cx.new_view(|cx| crate::app::App::new(cx))).unwrap();
+    cx.open_window(opts, |cx| cx.new_view(crate::app::App::new)).unwrap();
   });
 }