Small fixes

Author: Peter554

rust/src/caching.rs

@@ -7,7 +7,6 @@ use pyo3::types::{PyDict, PySet};
 use pyo3::types::{PyDictMethods, PySetMethods};
 use pyo3::{Bound, PyAny, PyResult, Python, pyfunction};
 use std::collections::{HashMap, HashSet};
-use serde_json;
 
 /// Writes the cache file containing all the imports for a given package.
 /// Args:
@@ -16,7 +15,7 @@ use serde_json;
 /// - file_system: The file system interface to use. (A BasicFileSystem.)
 #[pyfunction]
 pub fn write_cache_data_map_file<'py>(
-    py: Python<'py>,
+    _py: Python<'py>,
     filename: &str,
     imports_by_module: Bound<'py, PyDict>,
     file_system: Bound<'py, PyAny>,

rust/src/module_finding.rs

@@ -20,7 +20,6 @@ impl fmt::Display for Module {
     }
 }
 
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 /// Set of modules found under a single package, together with metadata.
 pub struct FoundPackage {

src/grimp/adaptors/caching.py

@@ -120,6 +120,7 @@ def write(
         self,
         imports_by_module: Dict[Module, Set[DirectImport]],
     ) -> None:
+        self._write_marker_files_if_not_already_there()
         # Write data file.
         data_cache_filename = self.file_system.join(
             self.cache_dir,
@@ -129,31 +130,11 @@ def write(
                 exclude_type_checking_imports=self.exclude_type_checking_imports,
             ),
         )
-        # Rust version
         rust.write_cache_data_map_file(
             filename=data_cache_filename,
             imports_by_module=imports_by_module,
             file_system=self.file_system,
         )
-        self._write_marker_files_if_not_already_there()
-        # Python version
-        primitives_map: PrimitiveFormat = {}
-        for found_package in self.found_packages:
-            primitives_map_for_found_package: PrimitiveFormat = {
-                module_file.module.name: [
-                    (
-                        direct_import.imported.name,
-                        direct_import.line_number,
-                        direct_import.line_contents,
-                    )
-                    for direct_import in imports_by_module[module_file.module]
-                ]
-                for module_file in found_package.module_files
-            }
-            primitives_map.update(primitives_map_for_found_package)
-
-        serialized = json.dumps(primitives_map)
-        # self.file_system.write(data_cache_filename, serialized)
 
         logger.info(f"Wrote data cache file {data_cache_filename}.")