Merge pull request #250 from LilyAcorn/refactor-graph-wrapper

Refactor graph wrapper

Author: seddonym

rust/src/errors.rs

@@ -1,16 +1,21 @@
-use crate::exceptions::{
-    CorruptCache, InvalidModuleExpression, ModuleNotPresent, NoSuchContainer, ParseError,
-};
+use crate::exceptions;
 use pyo3::PyErr;
 use pyo3::exceptions::PyValueError;
 use ruff_python_parser::ParseError as RuffParseError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
-pub enum GrimpError {
-    #[error("Module {0} is not present in the graph.")]
-    ModuleNotPresent(String),
+#[error("Module {0} is not present in the graph.")]
+pub struct ModuleNotPresent(pub String);
+
+impl From<ModuleNotPresent> for PyErr {
+    fn from(value: ModuleNotPresent) -> Self {
+        exceptions::ModuleNotPresent::new_err(value.to_string())
+    }
+}
 
+#[derive(Debug, Error)]
+pub enum GrimpError {
     #[error("Container {0} does not exist.")]
     NoSuchContainer(String),
 
@@ -39,16 +44,17 @@ impl From<GrimpError> for PyErr {
     fn from(value: GrimpError) -> Self {
         // A default mapping from `GrimpError`s to python exceptions.
         match value {
-            GrimpError::ModuleNotPresent(_) => ModuleNotPresent::new_err(value.to_string()),
-            GrimpError::NoSuchContainer(_) => NoSuchContainer::new_err(value.to_string()),
+            GrimpError::NoSuchContainer(_) => {
+                exceptions::NoSuchContainer::new_err(value.to_string())
+            }
             GrimpError::SharedDescendants => PyValueError::new_err(value.to_string()),
             GrimpError::InvalidModuleExpression(_) => {
-                InvalidModuleExpression::new_err(value.to_string())
+                exceptions::InvalidModuleExpression::new_err(value.to_string())
             }
             GrimpError::ParseError {
                 line_number, text, ..
-            } => PyErr::new::<ParseError, _>((line_number, text)),
-            GrimpError::CorruptCache(_) => CorruptCache::new_err(value.to_string()),
+            } => PyErr::new::<exceptions::ParseError, _>((line_number, text)),
+            GrimpError::CorruptCache(_) => exceptions::CorruptCache::new_err(value.to_string()),
         }
     }
 }

rust/src/graph/direct_import_queries.rs

@@ -1,7 +1,7 @@
 use crate::errors::{GrimpError, GrimpResult};
 use crate::graph::{
-    EMPTY_IMPORT_DETAILS, EMPTY_MODULE_TOKENS, ExtendWithDescendants, Graph, ImportDetails,
-    MODULE_NAMES, ModuleToken,
+    EMPTY_IMPORT_DETAILS, EMPTY_MODULE_TOKENS, ExtendWithDescendants, Graph, MODULE_NAMES,
+    ModuleToken, PyImportDetails,
 };
 use crate::module_expressions::ModuleExpression;
 use rustc_hash::FxHashSet;
@@ -49,7 +49,7 @@ impl Graph {
         &self,
         importer: ModuleToken,
         imported: ModuleToken,
-    ) -> &FxHashSet<ImportDetails> {
+    ) -> &FxHashSet<PyImportDetails> {
         match self.import_details.get(&(importer, imported)) {
             Some(import_details) => import_details,
             None => &EMPTY_IMPORT_DETAILS,

rust/src/graph/graph_manipulation.rs

@@ -1,5 +1,5 @@
 use crate::graph::{
-    Graph, IMPORT_LINE_CONTENTS, ImportDetails, MODULE_NAMES, Module, ModuleIterator, ModuleToken,
+    Graph, IMPORT_LINE_CONTENTS, MODULE_NAMES, Module, ModuleIterator, ModuleToken, PyImportDetails,
 };
 use rustc_hash::FxHashSet;
 use slotmap::secondary::Entry;
@@ -137,7 +137,7 @@ impl Graph {
             self.import_details
                 .entry((importer, imported))
                 .or_default()
-                .insert(ImportDetails::new(line_number, line_contents));
+                .insert(PyImportDetails::new(line_number, line_contents));
         }
     }