backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 00:01:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable as_conversions lint

Browse source 
There were some very, uh, creative (and inconsistent) ways to convert
between numeric types in here...
This commit is contained in:
Charles Hall 2024-05-12 15:32:23 -07:00
parent a78bf8f50b
commit 71c48f66c4
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
21 changed files with 195 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/api/client_server/relations.rs
View file

@ -1,6 +1,9 @@
use ruma::api::client::relations::{
get_relating_events, get_relating_events_with_rel_type,
get_relating_events_with_rel_type_and_event_type,
use ruma::{
api::client::relations::{
get_relating_events, get_relating_events_with_rel_type,
get_relating_events_with_rel_type_and_event_type,
},
uint,
};
use crate::{service::rooms::timeline::PduCount, services, Result, Ruma};
@ -28,9 +31,10 @@ pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
// Use limit or else 10, with maximum 100
let limit = body
.limit
.and_then(|u| u32::try_from(u).ok())
.map_or(10_usize, |u| u as usize)
.min(100);
.map(|x| x.min(uint!(100)))
.unwrap_or(uint!(10))
.try_into()
.expect("0-100 should fit in usize");
let res = services()
.rooms
@ -78,9 +82,10 @@ pub(crate) async fn get_relating_events_with_rel_type_route(
// Use limit or else 10, with maximum 100
let limit = body
.limit
.and_then(|u| u32::try_from(u).ok())
.map_or(10_usize, |u| u as usize)
.min(100);
.map(|x| x.min(uint!(100)))
.unwrap_or(uint!(10))
.try_into()
.expect("0-100 should fit in usize");
let res = services()
.rooms
@ -126,9 +131,10 @@ pub(crate) async fn get_relating_events_route(
// Use limit or else 10, with maximum 100
let limit = body
.limit
.and_then(|u| u32::try_from(u).ok())
.map_or(10_usize, |u| u as usize)
.min(100);
.map(|x| x.min(uint!(100)))
.unwrap_or(uint!(10))
.try_into()
.expect("0-100 should fit in usize");
services()
.rooms