Merge pull request #1395 from PSeitz/fix_clippy

fix clippy
quickwit-oss · Jun 21, 2022 · de178a1 · de178a1
2 parents 11e4225 + f21b73d
commit de178a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git 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::<UntrackedIndexMeta>(&json).unwrap_err();
+        let err = serde_json::from_str::<UntrackedIndexMeta>(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::<UntrackedIndexMeta>(&json).unwrap_err();
+        let err = serde_json::from_str::<UntrackedIndexMeta>(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
@@ -162,10 +162,7 @@ impl FastValue for f64 {
 
 impl FastValue for bool {
     fn from_u64(val: u64) -> Self {
-        match val {
-            0 => false,
-            _ => true,
-        }
+        val != 0u64
     }
 
     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();