Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code

Browse source
This commit is contained in:
Joscha 2022-09-09 21:56:01 +02:00
parent cb1fdb41b8
commit 37df869695
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/vault/euph.rs
View file

@ -46,12 +46,6 @@ impl FromSql for WTime {
} }
} }
impl From<EuphRequest> for super::Request {
fn from(r: EuphRequest) -> Self {
Self::Euph(r)
}
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct EuphVault { pub struct EuphVault {
vault: super::Vault, vault: super::Vault,
@ -173,7 +167,7 @@ macro_rules! requests_vault_fn {
( $var:ident : $fn:ident( $( $arg:ident : $ty:ty ),* ) ) => { ( $var:ident : $fn:ident( $( $arg:ident : $ty:ty ),* ) ) => {
pub fn $fn(&self $( , $arg: $ty )* ) { pub fn $fn(&self $( , $arg: $ty )* ) {
let request = EuphRequest::$var($var { $( $arg, )* }); let request = EuphRequest::$var($var { $( $arg, )* });
let _ = self.vault.tx.send(request.into()); let _ = self.vault.tx.send(super::Request::Euph(request));
} }
}; };
( $var:ident : $fn:ident( $( $arg:ident : $ty:ty ),* ) -> $res:ty ) => { ( $var:ident : $fn:ident( $( $arg:ident : $ty:ty ),* ) -> $res:ty ) => {
@ -183,7 +177,7 @@ macro_rules! requests_vault_fn {
$( $arg, )* $( $arg, )*
result: tx, result: tx,
}); });
let _ = self.vault.tx.send(request.into()); let _ = self.vault.tx.send(super::Request::Euph(request));
rx.await.unwrap() rx.await.unwrap()
} }
}; };
@ -359,18 +353,13 @@ impl Request for Join {
impl Request for Delete { impl Request for Delete {
fn perform(self, conn: &mut Connection) -> rusqlite::Result<()> { fn perform(self, conn: &mut Connection) -> rusqlite::Result<()> {
// TODO Clean up conn.execute(
let tx = conn.transaction()?;
tx.execute(
" "
DELETE FROM euph_rooms DELETE FROM euph_rooms
WHERE room = ? WHERE room = ?
", ",
[&self.room], [&self.room],
)?; )?;
tx.commit()?;
Ok(()) Ok(())
} }
} }