fix: some compile time errors

Only 174 errors left!

src/service/rooms/alias/data.rs

@@ -1,22 +1,24 @@
+use ruma::{RoomId, RoomAliasId};
+
 pub trait Data {
     /// Creates or updates the alias to the given room id.
-    pub fn set_alias(
+    fn set_alias(
         alias: &RoomAliasId,
         room_id: &RoomId
     ) -> Result<()>;
 
     /// Forgets about an alias. Returns an error if the alias did not exist.
-    pub fn remove_alias(
+    fn remove_alias(
         alias: &RoomAliasId,
     ) -> Result<()>;
 
     /// Looks up the roomid for the given alias.
-    pub fn resolve_local_alias(
+    fn resolve_local_alias(
         alias: &RoomAliasId,
     ) -> Result<()>;
 
     /// Returns all local aliases that point to the given room
-    pub fn local_aliases_for_room(
+    fn local_aliases_for_room(
         alias: &RoomAliasId,
     ) -> Result<()>;
 }

src/service/rooms/alias/mod.rs

@@ -1,14 +1,13 @@
 mod data;
 pub use data::Data;
-
-use crate::service::*;
+use ruma::{RoomAliasId, RoomId};
 
 pub struct Service<D: Data> {
     db: D,
 }
 
 impl Service<_> {
-    #[tracing::instrument(skip(self, globals))]
+    #[tracing::instrument(skip(self))]
     pub fn set_alias(
         &self,
         alias: &RoomAliasId,
@@ -17,7 +16,7 @@ impl Service<_> {
         self.db.set_alias(alias, room_id)
     }
 
-    #[tracing::instrument(skip(self, globals))]
+    #[tracing::instrument(skip(self))]
     pub fn remove_alias(
         &self,
         alias: &RoomAliasId,