fixing CI

weso · Dec 22, 2023 · 6160032 · 6160032
1 parent cc2240a
commit 6160032
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 32 deletions.
diff --git a/examples/serialize_bench.rs b/examples/serialize_bench.rs
@@ -16,12 +16,12 @@ fn main() {
     let rdf_path: &String = &args[1];
     let zarr_path: &String = &args[2];
     let shard_size: &String = &args[3];
-  
+
     let before = Instant::now();
 
     LocalStorage::new(MatrixLayout)
         .serialize(
-                    &zarr_path.as_str(),
+            &zarr_path.as_str(),
             &rdf_path.as_str(),
             ChunkingStrategy::Sharding(shard_size.parse::<u64>().unwrap()),
         )

diff --git a/src/dictionary.rs b/src/dictionary.rs
@@ -77,10 +77,7 @@ impl Dictionary {
 
     pub fn get_predicate_idx(&self, predicate: &str) -> Option<usize> {
         let mut locator = self.predicates.locator();
-        match locator.run(predicate) {
-            Some(value) => Some(value + 1),
-            None => None,
-        }
+        locator.run(predicate).map(|value| value + 1)
     }
 
     pub fn get_predicate_idx_unchecked(&self, predicate: &str) -> usize {

diff --git a/src/engine/array.rs b/src/engine/array.rs
@@ -12,12 +12,11 @@ impl EngineStrategy<CsMat<u8>> for ZarrArray {
         Ok(&matrix * self)
     }
 
-    fn get_predicate(&self, value: u8) ->  EngineResult<CsMat<u8>>  {
-
+    fn get_predicate(&self, _value: u8) -> EngineResult<CsMat<u8>> {
         unimplemented!()
     }
 
-    fn get_object(&self, index: usize) -> EngineResult<CsMat<u8>> {     
+    fn get_object(&self, index: usize) -> EngineResult<CsMat<u8>> {
         let mut matrix = TriMat::new((self.cols(), self.cols()));
         matrix.add_triplet(index, index, 1);
         let matrix = matrix.to_csc();

diff --git a/src/engine/chunk.rs b/src/engine/chunk.rs
@@ -23,7 +23,7 @@ impl<T: ReadableStorageTraits> EngineStrategy<Vec<u8>> for Array<T> {
         }
     }
 
-    fn get_predicate(&self, index: u8) -> EngineResult<Vec<u8>> {
+    fn get_predicate(&self, _index: u8) -> EngineResult<Vec<u8>> {
         unimplemented!()
     }
 

diff --git a/src/storage/tabular.rs b/src/storage/tabular.rs
@@ -80,13 +80,12 @@ where
         graph
             .iter()
             .enumerate()
-            .map(|(subject, triples)| {
+            .flat_map(|(subject, triples)| {
                 triples
                     .iter()
                     .map(|&(predicate, object)| (subject as u32, predicate, object))
                     .collect::<Vec<Chunk>>()
             })
-            .flatten()
             .collect::<Vec<Chunk>>()
     }
 

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -68,7 +68,6 @@ impl Predicate {
     pub fn get_idx(self, dictionary: &Dictionary) -> u8 {
         dictionary.get_predicate_idx_unchecked(self.into()) as u8
     }
-
 }
 
 impl From<Predicate> for &str {
@@ -182,8 +181,5 @@ impl Graph {
             Predicate::Manufacturer.get_idx(dictionary),
         );
         ans.to_csc()
-
-
-
     }
 }
diff --git a/tests/get_object_test.rs b/tests/get_object_test.rs
@@ -2,7 +2,7 @@ use remote_hdt::{
     engine::EngineStrategy,
     storage::{matrix::MatrixLayout, tabular::TabularLayout, ChunkingStrategy, LocalStorage},
 };
-use sprs:: TriMat;
+use sprs::TriMat;
 mod common;
 
 #[test]
@@ -48,10 +48,8 @@ fn get_object_tabular_test() {
         .get_object(common::Object::Alan.get_idx(&storage.get_dictionary()))
         .unwrap();
 
-    let mut expected = TriMat::new((4,9));
-    expected.add_triplet(1,3,3);
+    let mut expected = TriMat::new((4, 9));
+    expected.add_triplet(1, 3, 3);
     let expected = expected.to_csc();
-    assert_eq!(actual, expected )
+    assert_eq!(actual, expected)
 }
-
-
diff --git a/tests/get_subject_test.rs b/tests/get_subject_test.rs
@@ -2,7 +2,7 @@ use remote_hdt::{
     engine::EngineStrategy,
     storage::{matrix::MatrixLayout, tabular::TabularLayout, ChunkingStrategy, LocalStorage},
 };
-use sprs:: TriMat;
+use sprs::TriMat;
 mod common;
 
 #[test]
@@ -48,13 +48,12 @@ fn get_subject_tabular_test() {
         .get_subject(common::Subject::Alan.get_idx(&storage.get_dictionary()))
         .unwrap();
 
-        let mut result = TriMat::new((4,9));
-        result.add_triplet(0,0,2);
-        result.add_triplet(0,1,4);
-        result.add_triplet(0,2,5);
-        result.add_triplet(0,7,7);
-        result.add_triplet(0,8,8);
-        let result = result.to_csc();
-        assert_eq!(actual, result)
+    let mut result = TriMat::new((4, 9));
+    result.add_triplet(0, 0, 2);
+    result.add_triplet(0, 1, 4);
+    result.add_triplet(0, 2, 5);
+    result.add_triplet(0, 7, 7);
+    result.add_triplet(0, 8, 8);
+    let result = result.to_csc();
+    assert_eq!(actual, result)
 }
-