chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split AnyPushRuleConversionError in two and impl Error

Browse Source
This commit is contained in:
Kinrany 2020-07-22 21:49:18 +03:00 committed by Jonas Platte
parent 580aaf4858
commit 9190bff1d0
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ruma-common/src/push.rs
View File

@ -4,7 +4,8 @@
use std::{ use std::{
convert::TryFrom, convert::TryFrom,
fmt::{self, Formatter}, error::Error,
fmt::{self, Display, Formatter},
}; };
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
@ -167,13 +168,21 @@ impl From<AnyPushRule> for PushRule {
} }
} }
/// An error that happens when `AnyPushRule` cannot be converted /// An error that happens when `AnyPushRule` cannot
/// into a more specific push rule type. /// be converted into `PatternedPushRule`
#[derive(Debug)] #[derive(Debug)]
pub struct AnyPushRuleConversionError; pub struct MissingPatternError;
impl Display for MissingPatternError {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "Push rule does not have a pattern.")
}
}
impl Error for MissingPatternError {}
impl TryFrom<AnyPushRule> for PatternedPushRule { impl TryFrom<AnyPushRule> for PatternedPushRule {
type Error = AnyPushRuleConversionError; type Error = MissingPatternError;
fn try_from(push_rule: AnyPushRule) -> Result<Self, Self::Error> { fn try_from(push_rule: AnyPushRule) -> Result<Self, Self::Error> {
if let AnyPushRule { actions, default, enabled, rule_id, pattern: Some(pattern), .. } = if let AnyPushRule { actions, default, enabled, rule_id, pattern: Some(pattern), .. } =
@ -181,13 +190,26 @@ impl TryFrom<AnyPushRule> for PatternedPushRule {
{ {
Ok(PatternedPushRule { actions, default, enabled, rule_id, pattern }) Ok(PatternedPushRule { actions, default, enabled, rule_id, pattern })
} else { } else {
Err(AnyPushRuleConversionError) Err(MissingPatternError)
} }
} }
} }
/// An error that happens when `AnyPushRule` cannot
/// be converted into `ConditionalPushRule`
#[derive(Debug)]
pub struct MissingConditionsError;
impl Display for MissingConditionsError {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "Push rule has no conditions.")
}
}
impl Error for MissingConditionsError {}
impl TryFrom<AnyPushRule> for ConditionalPushRule { impl TryFrom<AnyPushRule> for ConditionalPushRule {
type Error = AnyPushRuleConversionError; type Error = MissingConditionsError;
fn try_from(push_rule: AnyPushRule) -> Result<Self, Self::Error> { fn try_from(push_rule: AnyPushRule) -> Result<Self, Self::Error> {
if let AnyPushRule { if let AnyPushRule {
@ -201,7 +223,7 @@ impl TryFrom<AnyPushRule> for ConditionalPushRule {
{ {
Ok(ConditionalPushRule { actions, default, enabled, rule_id, conditions }) Ok(ConditionalPushRule { actions, default, enabled, rule_id, conditions })
} else { } else {
Err(AnyPushRuleConversionError) Err(MissingConditionsError)
} }
} }
} }