Enable more lints and apply their suggestions

src/database/abstraction.rs

@@ -22,7 +22,7 @@ pub trait Tree: Send + Sync {
     fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>>;
 
     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;
+    fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;
 
     fn remove(&self, key: &[u8]) -> Result<()>;
 
@@ -35,7 +35,7 @@ pub trait Tree: Send + Sync {
     ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
 
     fn increment(&self, key: &[u8]) -> Result<Vec<u8>>;
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;
+    fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;
 
     fn scan_prefix<'a>(
         &'a self,

src/database/key_backups.rs

@@ -81,7 +81,7 @@ impl KeyBackups {
         )?;
         self.backupid_etag
             .insert(&key, &globals.next_count()?.to_be_bytes())?;
-        Ok(version.to_string())
+        Ok(version.to_owned())
     }
 
     pub fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>> {

src/database/proxy.rs

@@ -136,7 +136,7 @@ impl std::str::FromStr for WildCardedDomain {
         })
     }
 }
-impl<'de> serde::de::Deserialize<'de> for WildCardedDomain {
+impl<'de> Deserialize<'de> for WildCardedDomain {
     fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
     where
         D: serde::de::Deserializer<'de>,

src/database/rooms.rs

@@ -50,7 +50,7 @@ pub type StateHashId = Vec<u8>;
 pub type CompressedStateEvent = [u8; 2 * size_of::<u64>()];
 
 pub struct Rooms {
-    pub edus: edus::RoomEdus,
+    pub edus: RoomEdus,
     pub(super) pduid_pdu: Arc<dyn Tree>, // PduId = ShortRoomId + Count
     pub(super) eventid_pduid: Arc<dyn Tree>,
     pub(super) roomid_pduleaves: Arc<dyn Tree>,
@@ -371,13 +371,13 @@ impl Rooms {
         {
             let statediffnew = new_state_ids_compressed
                 .difference(&parent_stateinfo.1)
-                .cloned()
+                .copied()
                 .collect::<HashSet<_>>();
 
             let statediffremoved = parent_stateinfo
                 .1
                 .difference(&new_state_ids_compressed)
-                .cloned()
+                .copied()
                 .collect::<HashSet<_>>();
 
             (statediffnew, statediffremoved)
@@ -498,7 +498,7 @@ impl Rooms {
         if parent != 0_u64 {
             let mut response = self.load_shortstatehash_info(parent)?;
             let mut state = response.last().unwrap().1.clone();
-            state.extend(added.iter().cloned());
+            state.extend(added.iter().copied());
             for r in &removed {
                 state.remove(r);
             }
@@ -1773,13 +1773,13 @@ impl Rooms {
                 if let Some(parent_stateinfo) = states_parents.last() {
                     let statediffnew = state_ids_compressed
                         .difference(&parent_stateinfo.1)
-                        .cloned()
+                        .copied()
                         .collect::<HashSet<_>>();
 
                     let statediffremoved = parent_stateinfo
                         .1
                         .difference(&state_ids_compressed)
-                        .cloned()
+                        .copied()
                         .collect::<HashSet<_>>();
 
                     (statediffnew, statediffremoved)

src/database/rooms/edus.rs

@@ -331,7 +331,7 @@ impl RoomEdus {
         &self,
         user_id: &UserId,
         room_id: &RoomId,
-        presence: ruma::events::presence::PresenceEvent,
+        presence: PresenceEvent,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
         // TODO: Remove old entry? Or maybe just wipe completely from time to time?