Skip to content

Commit bfa440c

Browse files
committed
Do not use facet-reflect in graphANNIS core
1 parent a9db545 commit bfa440c

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ binary-layout = "4.0.1"
1515
bincode = "1.2"
1616
clru = "0.6.1"
1717
facet = "0.28.0"
18-
facet-reflect = "0.28.0"
1918
itertools = "0.10"
2019
lazy_static = "1.4"
2120
log = "0.4"

core/src/errors.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::{
33
sync::PoisonError,
44
};
55

6-
use facet_reflect::ReflectError;
76
use thiserror::Error;
87

98
use crate::types::AnnoKey;
@@ -75,8 +74,6 @@ pub enum GraphAnnisCoreError {
7574
#[error(transparent)]
7675
TomlSerializer(#[from] toml::ser::Error),
7776
#[error(transparent)]
78-
Reflection(#[from] ReflectError),
79-
#[error(transparent)]
8077
Other(#[from] Box<dyn std::error::Error + Send + Sync>),
8178
}
8279

core/src/types.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use facet::Facet;
2-
use facet_reflect::Partial;
32
use num_traits::{Bounded, FromPrimitive, Num, ToPrimitive};
43
use serde::Serialize;
54
use serde::de::DeserializeOwned;
@@ -191,11 +190,11 @@ impl FromStr for DefaultComponentType {
191190
type Err = GraphAnnisCoreError;
192191

193192
fn from_str(s: &str) -> StdResult<Self, Self::Err> {
194-
let result = Partial::alloc_shape(DefaultComponentType::SHAPE)?
195-
.select_variant_named(s)?
196-
.build()?
197-
.materialize()?;
198-
Ok(result)
193+
if s == "Edge" {
194+
Ok(Self::Edge)
195+
} else {
196+
Err(GraphAnnisCoreError::InvalidComponentType(s.to_string()))
197+
}
199198
}
200199
}
201200

0 commit comments

Comments
 (0)