Skip to content

Commit 4708171

Browse files
authored
Fix some of the things current Clippy complains about (#2363)
1 parent b493743 commit 4708171

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

common/src/bitset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::io::Write;
2-
use std::{fmt, io, u64};
2+
use std::{fmt, io};
33

44
use ownedbytes::OwnedBytes;
55

src/aggregation/bucket/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ mod term_agg;
2828
mod term_missing_agg;
2929

3030
use std::collections::HashMap;
31+
use std::fmt;
3132

3233
pub use histogram::*;
3334
pub use range::*;
@@ -72,12 +73,12 @@ impl From<&str> for OrderTarget {
7273
}
7374
}
7475

75-
impl ToString for OrderTarget {
76-
fn to_string(&self) -> String {
76+
impl fmt::Display for OrderTarget {
77+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
7778
match self {
78-
OrderTarget::Key => "_key".to_string(),
79-
OrderTarget::Count => "_count".to_string(),
80-
OrderTarget::SubAggregation(agg) => agg.to_string(),
79+
OrderTarget::Key => f.write_str("_key"),
80+
OrderTarget::Count => f.write_str("_count"),
81+
OrderTarget::SubAggregation(agg) => agg.fmt(f),
8182
}
8283
}
8384
}

src/aggregation/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ use itertools::Itertools;
159159
use serde::de::{self, Visitor};
160160
use serde::{Deserialize, Deserializer, Serialize};
161161

162-
pub(crate) fn invalid_agg_request(message: String) -> crate::TantivyError {
163-
crate::TantivyError::AggregationError(AggregationError::InvalidRequest(message))
164-
}
165-
166162
fn parse_str_into_f64<E: de::Error>(value: &str) -> Result<f64, E> {
167163
let parsed = value.parse::<f64>().map_err(|_err| {
168164
de::Error::custom(format!("Failed to parse f64 from string: {:?}", value))

src/collector/facet_collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::cmp::Ordering;
22
use std::collections::{btree_map, BTreeMap, BTreeSet, BinaryHeap};
3+
use std::io;
34
use std::ops::Bound;
4-
use std::{io, u64, usize};
55

66
use crate::collector::{Collector, SegmentCollector};
77
use crate::fastfield::FacetReader;

src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ pub struct Version {
255255

256256
impl fmt::Debug for Version {
257257
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
258-
write!(f, "{}", self.to_string())
258+
fmt::Display::fmt(self, f)
259259
}
260260
}
261261

@@ -266,9 +266,10 @@ static VERSION: Lazy<Version> = Lazy::new(|| Version {
266266
index_format_version: INDEX_FORMAT_VERSION,
267267
});
268268

269-
impl ToString for Version {
270-
fn to_string(&self) -> String {
271-
format!(
269+
impl fmt::Display for Version {
270+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
271+
write!(
272+
f,
272273
"tantivy v{}.{}.{}, index_format v{}",
273274
self.major, self.minor, self.patch, self.index_format_version
274275
)

sstable/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::io::{self, Write};
22
use std::ops::Range;
3-
use std::usize;
43

54
use merge::ValueMerger;
65

0 commit comments

Comments
 (0)