magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

elaborate error macro and apply at various callsites

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-13 21:11:05 +00:00
parent b3f2288d07
commit 05efd9b044
23 changed files with 161 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/service/appservice/mod.rs
View file

@ -2,7 +2,7 @@ mod data;
use std::{collections::BTreeMap, sync::Arc};
use conduit::Result;
use conduit::{err, Result};
use data::Data;
use futures_util::Future;
use regex::RegexSet;
@ -171,7 +171,7 @@ impl Service {
.write()
.await
.remove(service_name)
.ok_or_else(|| crate::Error::Err("Appservice not found".to_owned()))?;
.ok_or(err!("Appservice not found"))?;
// remove the appservice from the database
self.db.unregister_appservice(service_name)?;