Zynh0722
/
Riven
forked from mirror/Riven
1
0
Fork 0
Code Pull Requests Activity

Clean up double if-lets with tuple matches

users/mingwei/unknown-variant-messy
Mingwei Samuel 2022-03-14 13:05:54 -07:00
parent 1b62208c78
commit 43d0578ab7
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
example/proxy/src/main.rs
View File

@ -129,19 +129,16 @@ fn paths_match(ref_path: &str, req_path: &str) -> bool {
let mut ref_iter = ref_path.split('/');
let mut req_iter = req_path.split('/');
loop {
let ref_seg_opt = ref_iter.next();
let req_seg_opt = req_iter.next();
if ref_seg_opt.is_none() != req_seg_opt.is_none() {
return false;
}
if let Some(ref_seg) = ref_seg_opt {
if let Some(req_seg) = req_seg_opt {
if ref_seg.starts_with('{') || ref_seg == req_seg {
continue;
match (ref_iter.next(), req_iter.next()) {
(None, None) => return true,
(Some(ref_seg), Some(req_seg)) => {
if ref_seg.starts_with('{') || ref_seg == req_seg {
continue;
}
return false;
}
return false;
}}
return true;
_ => return false,
}
}
}

6
riven/src/req/rate_limit.rs
View File

@ -169,9 +169,7 @@ impl RateLimit {
let count_header_opt = headers.get(self.rate_limit_type.count_header())
.map(|h| h.to_str().expect("Failed to read count header as string."));
// https://github.com/rust-lang/rust/issues/53667
if let Some(limit_header) = limit_header_opt {
if let Some(count_header) = count_header_opt {
if let (Some(limit_header), Some(count_header)) = (limit_header_opt, count_header_opt) {
{
let buckets = self.buckets.upgradable_read();
if !buckets_require_updating(limit_header, &*buckets) {
@ -184,7 +182,7 @@ impl RateLimit {
}
// Notify waiters that buckets have updated (after unlocking).
self.update_notify.notify_waiters();
}}
}
}
}