fmt + clippy

This commit is contained in:
Robin Appelman 2025-08-21 00:10:48 +02:00
commit 73e00b699a

View file

@ -17,7 +17,7 @@ fn get_router(verb: &str) -> Option<&'static Router> {
.get_or_init(|| {
let mut routers: HashMap<&'static str, Router> = HashMap::default();
for route in all_routes().filter(|route| !route.ocs) {
let router = routers.entry(route.verb).or_insert_with(|| Router::new());
let router = routers.entry(route.verb).or_default();
let _ = router.insert(route.url, (route.id, route.url));
}
routers
@ -30,7 +30,7 @@ fn get_ocs_router(verb: &str) -> Option<&'static Router> {
.get_or_init(|| {
let mut routers: HashMap<&'static str, Router> = HashMap::default();
for route in all_routes().filter(|route| route.ocs) {
let router = routers.entry(route.verb).or_insert_with(|| Router::new());
let router = routers.entry(route.verb).or_default();
let _ = router.insert(route.url, (route.id, route.url));
}
routers
@ -61,18 +61,15 @@ pub fn match_url<'a>(verb: &str, url: &'a str) -> Option<RouteMatch<'a>> {
let url = url.split_once('?').map(|(url, _)| url).unwrap_or(url);
let (router, url) = if let Some(ocs_url) = url.strip_prefix("/ocs/v2.php") {
(get_ocs_router(verb), ocs_url)
(get_ocs_router(verb)?, ocs_url)
} else if let Some(ocs_url) = url.strip_prefix("/ocs/v1.php") {
(get_ocs_router(verb), ocs_url)
(get_ocs_router(verb)?, ocs_url)
} else {
(
get_router(verb),
get_router(verb)?,
url.strip_prefix("/index.php").unwrap_or(url),
)
};
let Some(router) = router else {
return None;
};
router
.at(url)
.map(|m| RouteMatch::Route(m.value.0, m.value.1))