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

events: Fix feature gate for aggregated relations

Browse Source 
We had a mix of two feature gates because of a mishap in rebasing.
This commit is contained in:
Jonas Platte 2022-03-22 14:47:35 +01:00
parent f0710fdf1b
commit 9da6bd4861
No known key found for this signature in database
GPG Key ID: BBA95679259D342F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruma-common/src/events/unsigned.rs
View File

@ -76,7 +76,7 @@ pub struct StateUnsigned<C: EventContent<EventType = StateEventType>> {
pub prev_content: Option<C>, pub prev_content: Option<C>,
/// Server-compiled information from other events relating to this event. /// Server-compiled information from other events relating to this event.
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-msc2675")]
#[serde(rename = "m.relations", skip_serializing_if = "Option::is_none")] #[serde(rename = "m.relations", skip_serializing_if = "Option::is_none")]
pub relations: Option<Relations>, pub relations: Option<Relations>,
} }
@ -88,7 +88,7 @@ impl<C: EventContent<EventType = StateEventType>> StateUnsigned<C> {
age: None, age: None,
transaction_id: None, transaction_id: None,
prev_content: None, prev_content: None,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-msc2675")]
relations: None, relations: None,
} }
} }
@ -128,7 +128,7 @@ impl<C: EventContent<EventType = StateEventType>> StateUnsigned<C> {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
transaction_id: Option<Box<TransactionId>>, transaction_id: Option<Box<TransactionId>>,
prev_content: Option<Raw<C>>, prev_content: Option<Raw<C>>,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-msc2675")]
#[serde(rename = "m.relations", skip_serializing_if = "Option::is_none")] #[serde(rename = "m.relations", skip_serializing_if = "Option::is_none")]
relations: Option<Relations>, relations: Option<Relations>,
} }
@ -140,7 +140,7 @@ impl<C: EventContent<EventType = StateEventType>> StateUnsigned<C> {
Ok(Self { Ok(Self {
age: raw.age, age: raw.age,
transaction_id: raw.transaction_id, transaction_id: raw.transaction_id,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-msc2675")]
relations: raw.relations, relations: raw.relations,
prev_content, prev_content,
}) })
@ -154,7 +154,7 @@ impl<C: EventContent<EventType = StateEventType>> StateUnsigned<C> {
age: self.age, age: self.age,
transaction_id: self.transaction_id.clone(), transaction_id: self.transaction_id.clone(),
prev_content: self.prev_content.as_ref().map(f), prev_content: self.prev_content.as_ref().map(f),
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-msc2675")]
relations: self.relations.clone(), relations: self.relations.clone(),
} }
} }