Hot-Reloading Refactor

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/search/data.rs

@@ -4,7 +4,7 @@ use crate::Result;
 
 type SearchPdusResult<'a> = Result<Option<(Box<dyn Iterator<Item = Vec<u8>> + 'a>, Vec<String>)>>;
 
-pub(crate) trait Data: Send + Sync {
+pub trait Data: Send + Sync {
 	fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()>;
 
 	fn search_pdus<'a>(&'a self, room_id: &RoomId, search_string: &str) -> SearchPdusResult<'a>;

src/service/rooms/search/mod.rs

@@ -1,22 +1,24 @@
 mod data;
 
-pub(crate) use data::Data;
+use std::sync::Arc;
+
+pub use data::Data;
 use ruma::RoomId;
 
 use crate::Result;
 
-pub(crate) struct Service {
-	pub(crate) db: &'static dyn Data,
+pub struct Service {
+	pub db: Arc<dyn Data>,
 }
 
 impl Service {
 	#[tracing::instrument(skip(self))]
-	pub(crate) fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
+	pub fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
 		self.db.index_pdu(shortroomid, pdu_id, message_body)
 	}
 
 	#[tracing::instrument(skip(self))]
-	pub(crate) fn search_pdus<'a>(
+	pub fn search_pdus<'a>(
 		&'a self, room_id: &RoomId, search_string: &str,
 	) -> Result<Option<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)>> {
 		self.db.search_pdus(room_id, search_string)