Skip to content

Commit a953515

Browse files
author
Charlie Tonneslan
authored
Fix clippy warnings: deprecated gen_range, manual div_ceil, legacy import (#2860)
- Replace deprecated rand::Rng::gen_range with random_range in benchmarks - Use usize::div_ceil instead of manual (len + size - 1) / size - Remove unused legacy std::i64 import - Replace 'if let Some(_)' with '.is_some()'
1 parent 993ef97 commit a953515

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

benches/str_search_and_get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn build_shared_indices(num_docs: usize, distribution: &str) -> BenchIndex {
4545
match distribution {
4646
"dense_random" => {
4747
for _doc_id in 0..num_docs {
48-
let suffix = rng.gen_range(0u64..1000u64);
48+
let suffix = rng.random_range(0u64..1000u64);
4949
let str_val = format!("str_{:03}", suffix);
5050

5151
writer
@@ -71,7 +71,7 @@ fn build_shared_indices(num_docs: usize, distribution: &str) -> BenchIndex {
7171
}
7272
"sparse_random" => {
7373
for _doc_id in 0..num_docs {
74-
let suffix = rng.gen_range(0u64..1000000u64);
74+
let suffix = rng.random_range(0u64..1000000u64);
7575
let str_val = format!("str_{:07}", suffix);
7676

7777
writer

src/aggregation/bucket/composite/calendar_interval.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ fn month_bucket_using_time_crate(timestamp_ns: i64) -> Result<i64, time::Error>
5454

5555
#[cfg(test)]
5656
mod tests {
57-
use std::i64;
58-
5957
use time::format_description::well_known::Iso8601;
6058
use time::UtcDateTime;
6159

src/aggregation/bucket/composite/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ mod tests {
533533
let expected_buckets_vec = expected_buckets.as_array().unwrap();
534534

535535
for page_size in 1..=expected_buckets_vec.len() {
536-
let page_count = (expected_buckets_vec.len() + page_size - 1) / page_size;
536+
let page_count = expected_buckets_vec.len().div_ceil(page_size);
537537
let mut after_key = None;
538538
for page_idx in 0..page_count {
539539
let mut agg_req_json = json!({
@@ -565,7 +565,7 @@ mod tests {
565565
"expected after_key on all but last page"
566566
);
567567
after_key = Some(res["my_composite"]["after_key"].clone());
568-
} else if let Some(_) = res["my_composite"].get("after_key") {
568+
} else if res["my_composite"].get("after_key").is_some() {
569569
// currently we sometime have an after_key on the last page,
570570
// check that the next "page" is empty
571571
let agg_req_json = json!({

0 commit comments

Comments
 (0)