nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

style: make clippy happier

Browse source
This commit is contained in:
Timo Kösters 2020-10-07 12:29:19 +02:00
parent 4964e21342
commit 304c53c4f5
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client_server/room.rs
View file

@ -354,12 +354,8 @@ pub async fn upgrade_room_route(
) -> ConduitResult<upgrade_room::Response> {
let sender_id = body.sender_id.as_ref().expect("user is authenticated");
// Validate the room version requested
let new_version =
RoomVersionId::try_from(body.new_version.clone()).expect("invalid room version id");
if !matches!(
new_version,
body.new_version,
RoomVersionId::Version5 | RoomVersionId::Version6
) {
return Err(Error::BadRequest(
@ -414,7 +410,7 @@ pub async fn upgrade_room_route(
let mut create_event_content =
ruma::events::room::create::CreateEventContent::new(sender_id.clone());
create_event_content.federate = federate;
create_event_content.room_version = new_version;
create_event_content.room_version = body.new_version.clone();
create_event_content.predecessor = predecessor;
db.rooms.build_and_append_pdu(

2
src/client_server/sync.rs
View file

@ -477,7 +477,7 @@ pub async fn sync_events_route(
})
.and_then(|pdu| {
serde_json::from_value::<Raw<ruma::events::room::member::MemberEventContent>>(
pdu.content.clone(),
pdu.content,
)
.expect("Raw::from_value always works")
.deserialize()