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

Fixup for previous commit

Browse Source
This commit is contained in:
Jonas Platte 2019-11-24 20:52:53 +01:00
parent cf5fccaccc
commit a57e867279
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruma-events-macros/tests/ruma_events_macros.rs
View File

@ -120,14 +120,14 @@ pub trait TryFromRaw: Sized {
type Raw: DeserializeOwned; type Raw: DeserializeOwned;
type Err: Display; type Err: Display;
fn try_from_raw(_: Self::Raw) -> Result<Self, (Self::Err, Self::Raw)>; fn try_from_raw(_: Self::Raw) -> Result<Self, Self::Err>;
} }
impl<T: FromRaw> TryFromRaw for T { impl<T: FromRaw> TryFromRaw for T {
type Raw = <T as FromRaw>::Raw; type Raw = <T as FromRaw>::Raw;
type Err = Infallible; type Err = Infallible;
fn try_from_raw(raw: Self::Raw) -> Result<Self, (Self::Err, Self::Raw)> { fn try_from_raw(raw: Self::Raw) -> Result<Self, Self::Err> {
Ok(Self::from_raw(raw)) Ok(Self::from_raw(raw))
} }
} }
@ -155,7 +155,7 @@ where
match T::try_from_raw(raw_data) { match T::try_from_raw(raw_data) {
Ok(value) => Ok(EventResult::Ok(value)), Ok(value) => Ok(EventResult::Ok(value)),
Err((err, _)) => Ok(EventResult::Err(InvalidEvent { Err(err) => Ok(EventResult::Err(InvalidEvent {
message: err.to_string(), message: err.to_string(),
json, json,
kind: InvalidEventKind::Validation, kind: InvalidEventKind::Validation,