snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rewrite some code with idiomatic Rust

Browse Source
This commit is contained in:
Kerollmops 2021-03-08 16:27:52 +01:00
parent b18ec00a7a
commit d781a6164a
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
milli/src/search/criteria/proximity.rs
View File

@ -357,9 +357,9 @@ fn resolve_plane_sweep_candidates(
) -> Option<(Position, u8, Position)> ) -> Option<(Position, u8, Position)>
{ {
// take the inner proximity of the first group as initial // take the inner proximity of the first group as initial
let mut proximity = groups.first()?.1.1; let (_, (_, mut proximity, _)) = groups.first()?;
let left_most_pos = groups.first()?.1.0; let (_, (left_most_pos, _, _)) = groups.first()?;
let right_most_pos = groups.last()?.1.2; let (_, (_, _, right_most_pos)) = groups.last()?;
for pair in groups.windows(2) { for pair in groups.windows(2) {
if let [(i1, (_, _, rpos1)), (i2, (lpos2, prox2, _))] = pair { if let [(i1, (_, _, rpos1)), (i2, (lpos2, prox2, _))] = pair {
@ -379,7 +379,7 @@ fn resolve_plane_sweep_candidates(
// if groups should be consecutives, we will only accept groups with a proximity of 0 // if groups should be consecutives, we will only accept groups with a proximity of 0
if !consecutive || proximity == 0 { if !consecutive || proximity == 0 {
Some((left_most_pos, proximity, right_most_pos)) Some((*left_most_pos, proximity, *right_most_pos))
} else { } else {
None None
} }