From 1440f3243b8d2cb7df3f3c4d61f0831d9fc93b9c Mon Sep 17 00:00:00 2001 From: Pascal Seitz Date: Tue, 21 Jun 2022 14:47:01 +0800 Subject: [PATCH 1/2] fix clippy --- src/core/index_meta.rs | 4 ++-- src/fastfield/mod.rs | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/core/index_meta.rs b/src/core/index_meta.rs index 8cd942930..fb79ac71e 100644 --- a/src/core/index_meta.rs +++ b/src/core/index_meta.rs @@ -469,7 +469,7 @@ mod tests { fn test_serialize_metas_invalid_comp() { let json = r#"{"index_settings":{"sort_by_field":{"field":"text","order":"Asc"},"docstore_compression":"zsstd","docstore_blocksize":1000000},"segments":[],"schema":[{"name":"text","type":"text","options":{"indexing":{"record":"position","fieldnorms":true,"tokenizer":"default"},"stored":false,"fast":false}}],"opstamp":0}"#; - let err = serde_json::from_str::(&json).unwrap_err(); + let err = serde_json::from_str::(json).unwrap_err(); assert_eq!( err.to_string(), "unknown variant `zsstd`, expected one of `none`, `lz4`, `brotli`, `snappy`, `zstd`, \ @@ -479,7 +479,7 @@ mod tests { let json = r#"{"index_settings":{"sort_by_field":{"field":"text","order":"Asc"},"docstore_compression":"zstd(bla=10)","docstore_blocksize":1000000},"segments":[],"schema":[{"name":"text","type":"text","options":{"indexing":{"record":"position","fieldnorms":true,"tokenizer":"default"},"stored":false,"fast":false}}],"opstamp":0}"#; - let err = serde_json::from_str::(&json).unwrap_err(); + let err = serde_json::from_str::(json).unwrap_err(); assert_eq!( err.to_string(), "unknown zstd option \"bla\" at line 1 column 103".to_string() diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index ce16d756a..dd0e51577 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -162,10 +162,7 @@ impl FastValue for f64 { impl FastValue for bool { fn from_u64(val: u64) -> Self { - match val { - 0 => false, - _ => true, - } + !matches!(val, 0) } fn to_u64(&self) -> u64 { @@ -853,7 +850,7 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); + let file = directory.open_read(path).unwrap(); assert_eq!(file.len(), 36); let composite_file = CompositeFile::open(&file)?; let file = composite_file.open_read(field).unwrap(); @@ -889,7 +886,7 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); + let file = directory.open_read(path).unwrap(); assert_eq!(file.len(), 48); let composite_file = CompositeFile::open(&file)?; let file = composite_file.open_read(field).unwrap(); @@ -923,7 +920,7 @@ mod tests { .unwrap(); serializer.close().unwrap(); } - let file = directory.open_read(&path).unwrap(); + let file = directory.open_read(path).unwrap(); assert_eq!(file.len(), 35); let composite_file = CompositeFile::open(&file)?; let file = composite_file.open_read(field).unwrap(); From f21b73d1f6d601cfb3bc999e2757d900ec19984f Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Tue, 21 Jun 2022 15:52:43 +0900 Subject: [PATCH 2/2] Apply suggestions from code review --- src/fastfield/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index dd0e51577..c69189747 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -162,7 +162,7 @@ impl FastValue for f64 { impl FastValue for bool { fn from_u64(val: u64) -> Self { - !matches!(val, 0) + val != 0u64 } fn to_u64(&self) -> u64 {