Fixed more compile time errors

src/service/rooms/edus/mod.rs

@@ -2,7 +2,9 @@ pub mod presence;
 pub mod read_receipt;
 pub mod typing;
 
-pub struct Service<D> {
+pub trait Data: presence::Data + read_receipt::Data + typing::Data {}
+
+pub struct Service<D: Data> {
     presence: presence::Service<D>,
     read_receipt: read_receipt::Service<D>,
     typing: typing::Service<D>,

src/service/rooms/edus/presence/data.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use ruma::{UserId, RoomId, events::presence::PresenceEvent};
+use crate::Result;
 
 pub trait Data {
     /// Adds a presence event which will be saved until a new event replaces it.

src/service/rooms/edus/presence/mod.rs

@@ -4,13 +4,13 @@ use std::collections::HashMap;
 pub use data::Data;
 use ruma::{RoomId, UserId, events::presence::PresenceEvent};
 
-use crate::service::*;
+use crate::Result;
 
 pub struct Service<D: Data> {
     db: D,
 }
 
-impl Service<_> {
+impl<D: Data> Service<D> {
     /// Adds a presence event which will be saved until a new event replaces it.
     ///
     /// Note: This method takes a RoomId because presence updates are always bound to rooms to

src/service/rooms/edus/read_receipt/data.rs

@@ -1,4 +1,5 @@
 use ruma::{RoomId, events::receipt::ReceiptEvent, UserId, serde::Raw};
+use crate::Result;
 
 pub trait Data {
     /// Replaces the previous read receipt.
@@ -14,13 +15,13 @@ pub trait Data {
         &self,
         room_id: &RoomId,
         since: u64,
-    ) -> impl Iterator<
+    ) -> Box<dyn Iterator<
         Item = Result<(
             Box<UserId>,
             u64,
             Raw<ruma::events::AnySyncEphemeralRoomEvent>,
         )>,
-    >;
+    >>;
 
     /// Sets a private read marker at `count`.
     fn private_read_set(&self, room_id: &RoomId, user_id: &UserId, count: u64) -> Result<()>;

src/service/rooms/edus/read_receipt/mod.rs

@@ -1,12 +1,14 @@
 mod data;
 pub use data::Data;
+
 use ruma::{RoomId, UserId, events::receipt::ReceiptEvent, serde::Raw};
+use crate::Result;
 
 pub struct Service<D: Data> {
     db: D,
 }
 
-impl Service<_> {
+impl<D: Data> Service<D> {
     /// Replaces the previous read receipt.
     pub fn readreceipt_update(
         &self,

src/service/rooms/edus/typing/data.rs

@@ -1,5 +1,5 @@
 use std::collections::HashSet;
-
+use crate::Result;
 use ruma::{UserId, RoomId};
 
 pub trait Data {
@@ -14,5 +14,5 @@ pub trait Data {
     fn last_typing_update(&self, room_id: &RoomId) -> Result<u64>;
 
     /// Returns all user ids currently typing.
-    fn typings_all(&self, room_id: &RoomId) -> Result<HashSet<UserId>>;
+    fn typings_all(&self, room_id: &RoomId) -> Result<HashSet<Box<UserId>>>;
 }

src/service/rooms/edus/typing/mod.rs

@@ -1,14 +1,14 @@
 mod data;
 pub use data::Data;
-use ruma::{UserId, RoomId};
+use ruma::{UserId, RoomId, events::SyncEphemeralRoomEvent};
 
-use crate::service::*;
+use crate::Result;
 
 pub struct Service<D: Data> {
     db: D,
 }
 
-impl Service<_> {
+impl<D: Data> Service<D> {
     /// Sets a user as typing until the timeout timestamp is reached or roomtyping_remove is
     /// called.
     pub fn typing_add(&self, user_id: &UserId, room_id: &RoomId, timeout: u64) -> Result<()> {