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

Make Result alias usable with any error type

Browse source
This commit is contained in:
Jonas Platte 2021-10-13 11:56:46 +02:00
parent f2ef5677e0
commit 91afa1e0e0
No known key found for this signature in database
GPG key ID: CC154DE0E30B7C67
5 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/database/proxy.rs
View file

@ -125,7 +125,7 @@ impl WildCardedDomain {
}
impl std::str::FromStr for WildCardedDomain {
type Err = std::convert::Infallible;
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
// maybe do some domain validation?
Ok(if s.starts_with("*.") {
WildCardedDomain::WildCarded(s[1..].to_owned())
@ -137,7 +137,7 @@ impl std::str::FromStr for WildCardedDomain {
}
}
impl<'de> Deserialize<'de> for WildCardedDomain {
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::de::Deserializer<'de>,
{

2
src/database/sending.rs
View file

@ -485,7 +485,7 @@ impl Sending {
kind: OutgoingKind,
events: Vec<SendingEventType>,
db: Arc<RwLock<Database>>,
) -> std::result::Result<OutgoingKind, (OutgoingKind, Error)> {
) -> Result<OutgoingKind, (OutgoingKind, Error)> {
let db = db.read().await;
match &kind {