Derive Facet for the types in graphannis-core types module

Author: thomaskrause

core/Cargo.toml

@@ -15,6 +15,7 @@ binary-layout = "4.0.1"
 bincode = "1.2"
 clru = "0.6.1"
 facet = "0.28.0"
+facet-reflect = "0.28.0"
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4"

core/src/errors.rs

@@ -3,11 +3,12 @@ use std::{
     sync::PoisonError,
 };
 
+use facet_reflect::ReflectError;
 use thiserror::Error;
 
 use crate::types::AnnoKey;
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, strum_macros::IntoStaticStr)]
 #[non_exhaustive]
 pub enum GraphAnnisCoreError {
     #[error("invalid component type {0}")]
@@ -74,6 +75,8 @@ pub enum GraphAnnisCoreError {
     #[error(transparent)]
     TomlSerializer(#[from] toml::ser::Error),
     #[error(transparent)]
+    Reflection(#[from] ReflectError),
+    #[error(transparent)]
     Other(#[from] Box<dyn std::error::Error + Send + Sync>),
 }
 

core/src/types.rs

@@ -1,4 +1,5 @@
 use facet::Facet;
+use facet_reflect::Partial;
 use num_traits::{Bounded, FromPrimitive, Num, ToPrimitive};
 use serde::Serialize;
 use serde::de::DeserializeOwned;
@@ -7,8 +8,6 @@ use std::fmt;
 use std::ops::AddAssign;
 
 use std::{convert::TryInto, str::FromStr};
-use strum::IntoEnumIterator;
-use strum_macros::{EnumIter, EnumString};
 
 use super::serializer::{FixedSizeKeySerializer, KeySerializer};
 use crate::serializer::KeyVec;
@@ -34,7 +33,9 @@ pub struct AnnoKey {
 }
 
 /// An annotation with a qualified name and a value.
-#[derive(Serialize, Deserialize, Default, Eq, PartialEq, PartialOrd, Ord, Clone, Debug, Hash)]
+#[derive(
+    Facet, Serialize, Deserialize, Default, Eq, PartialEq, PartialOrd, Ord, Clone, Debug, Hash,
+)]
 pub struct Annotation {
     /// Qualified name or unique "key" for the annotation
     pub key: AnnoKey,
@@ -43,7 +44,9 @@ pub struct Annotation {
 }
 
 /// Directed edge between a source and target node which are identified by their ID.
-#[derive(Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord, Clone, Debug, Hash, Default)]
+#[derive(
+    Facet, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord, Clone, Debug, Hash, Default,
+)]
 #[repr(C)]
 pub struct Edge {
     pub source: NodeID,
@@ -138,7 +141,8 @@ pub trait ComponentType:
 }
 
 /// A simplified implementation of a `ComponentType` that only has one type of edges.
-#[derive(Clone, Eq, PartialEq, PartialOrd, Ord, EnumString, EnumIter, Debug)]
+#[derive(Facet, Clone, Eq, PartialEq, PartialOrd, Ord, Debug)]
+#[repr(u16)]
 pub enum DefaultComponentType {
     Edge,
 }
@@ -163,7 +167,7 @@ impl fmt::Display for DefaultComponentType {
 
 pub struct DefaultGraphIndex;
 
-#[derive(Serialize, Deserialize)]
+#[derive(Facet, Serialize, Deserialize)]
 pub struct DefaultGlobalStatistics;
 
 impl ComponentType for DefaultComponentType {
@@ -176,15 +180,27 @@ impl ComponentType for DefaultComponentType {
         Ok(DefaultGraphIndex {})
     }
     fn all_component_types() -> Vec<Self> {
-        DefaultComponentType::iter().collect()
+        vec![DefaultComponentType::Edge]
     }
     fn calculate_global_statistics(_graph: &mut Graph<Self>) -> StdResult<(), ComponentTypeError> {
         Ok(())
     }
 }
 
+impl FromStr for DefaultComponentType {
+    type Err = GraphAnnisCoreError;
+
+    fn from_str(s: &str) -> StdResult<Self, Self::Err> {
+        let result = Partial::alloc_shape(DefaultComponentType::SHAPE)?
+            .select_variant_named(s)?
+            .build()?
+            .materialize()?;
+        Ok(result)
+    }
+}
+
 /// Identifies an edge component of the graph.
-#[derive(Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord, Hash, Clone, Debug)]
+#[derive(Facet, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord, Hash, Clone, Debug)]
 pub struct Component<CT: ComponentType> {
     /// Type of the component
     ctype: u16,

graphannis/Cargo.toml

@@ -24,6 +24,7 @@ regex = "1"
 [dependencies]
 boolean_expression = "0.4"
 csv = "1"
+facet = "0.28.0"
 fs2 = "0.4"
 graphannis-core = { path = "../core/", version = "^3" }
 itertools = "0.10"

graphannis/src/annis/errors.rs

@@ -1,6 +1,7 @@
 use std::{fmt::Display, sync::PoisonError};
 
 use crate::annis::types::LineColumnRange;
+
 use graphannis_core::{
     errors::{ComponentTypeError, GraphAnnisCoreError},
     types::NodeID,