Fix new clippy warnings

This commit is contained in:
Jonas Platte 2021-03-01 18:38:41 +01:00
parent a20c75d536
commit 4ced423612
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
2 changed files with 23 additions and 23 deletions

View File

@ -88,10 +88,10 @@ impl Parse for Metadata {
FieldValue::Name(n) => set_field(&mut name, n)?, FieldValue::Name(n) => set_field(&mut name, n)?,
FieldValue::Path(p) => set_field(&mut path, p)?, FieldValue::Path(p) => set_field(&mut path, p)?,
FieldValue::RateLimited(value, attrs) => { FieldValue::RateLimited(value, attrs) => {
rate_limited.push(MetadataField { value, attrs }) rate_limited.push(MetadataField { attrs, value })
} }
FieldValue::Authentication(value, attrs) => { FieldValue::Authentication(value, attrs) => {
authentication.push(MetadataField { value, attrs }) authentication.push(MetadataField { attrs, value })
} }
} }
} }

View File

@ -338,21 +338,21 @@ impl From<RedactedUnsigned> for RedactedSyncUnsigned {
fn from(redacted: RedactedUnsigned) -> Self { fn from(redacted: RedactedUnsigned) -> Self {
match redacted.redacted_because.map(|b| *b) { match redacted.redacted_because.map(|b| *b) {
Some(RedactionEvent { Some(RedactionEvent {
sender,
event_id,
origin_server_ts,
redacts,
unsigned,
content, content,
redacts,
event_id,
sender,
origin_server_ts,
unsigned,
.. ..
}) => Self { }) => Self {
redacted_because: Some(Box::new(SyncRedactionEvent { redacted_because: Some(Box::new(SyncRedactionEvent {
sender,
event_id,
origin_server_ts,
redacts,
unsigned,
content, content,
redacts,
event_id,
sender,
origin_server_ts,
unsigned,
})), })),
}, },
_ => Self { redacted_because: None }, _ => Self { redacted_because: None },
@ -376,21 +376,21 @@ impl RedactedSyncUnsigned {
pub fn into_full(self, room_id: RoomId) -> RedactedUnsigned { pub fn into_full(self, room_id: RoomId) -> RedactedUnsigned {
match self.redacted_because.map(|b| *b) { match self.redacted_because.map(|b| *b) {
Some(SyncRedactionEvent { Some(SyncRedactionEvent {
sender,
event_id,
origin_server_ts,
redacts,
unsigned,
content, content,
redacts,
event_id,
sender,
origin_server_ts,
unsigned,
}) => RedactedUnsigned { }) => RedactedUnsigned {
redacted_because: Some(Box::new(RedactionEvent { redacted_because: Some(Box::new(RedactionEvent {
room_id,
sender,
event_id,
origin_server_ts,
redacts,
unsigned,
content, content,
redacts,
event_id,
sender,
origin_server_ts,
room_id,
unsigned,
})), })),
}, },
_ => RedactedUnsigned { redacted_because: None }, _ => RedactedUnsigned { redacted_because: None },