From 2bd5da4a5aff70480d63544b25160f7dddf7d0db Mon Sep 17 00:00:00 2001 From: Tpt Date: Mon, 17 Apr 2023 12:21:55 +0200 Subject: [PATCH] Spargebra: Makes GroundTermPattern::Triple properly gated with the rdf-star feature It is only RDF-star specific --- Cargo.lock | 2 +- lib/Cargo.toml | 2 +- lib/spargebra/Cargo.toml | 2 +- lib/spargebra/src/term.rs | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52f50962..751e3972 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1638,7 +1638,7 @@ dependencies = [ [[package]] name = "spargebra" -version = "0.2.7" +version = "0.2.8-dev" dependencies = [ "oxilangtag", "oxiri", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index c425dd67..e748d063 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -40,7 +40,7 @@ lazy_static = "1" json-event-parser = "0.1" oxrdf = { version = "0.1.5", path="oxrdf", features = ["rdf-star", "oxsdatatypes"] } oxsdatatypes = { version = "0.1.1", path="oxsdatatypes" } -spargebra = { version = "0.2.7", path="spargebra", features = ["rdf-star", "sep-0002", "sep-0006"] } +spargebra = { version = "0.2.8-dev", path="spargebra", features = ["rdf-star", "sep-0002", "sep-0006"] } sparesults = { version = "0.1.7", path="sparesults", features = ["rdf-star"] } [target.'cfg(not(target_family = "wasm"))'.dependencies] diff --git a/lib/spargebra/Cargo.toml b/lib/spargebra/Cargo.toml index 101ef8a7..e580543a 100644 --- a/lib/spargebra/Cargo.toml +++ b/lib/spargebra/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spargebra" -version = "0.2.7" +version = "0.2.8-dev" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/lib/spargebra/src/term.rs b/lib/spargebra/src/term.rs index e2d29dc8..3ef91f68 100644 --- a/lib/spargebra/src/term.rs +++ b/lib/spargebra/src/term.rs @@ -577,6 +577,7 @@ pub enum GroundTermPattern { NamedNode(NamedNode), Literal(Literal), Variable(Variable), + #[cfg(feature = "rdf-star")] Triple(Box), } @@ -587,6 +588,7 @@ impl GroundTermPattern { Self::NamedNode(term) => write!(f, "{term}"), Self::Literal(term) => write!(f, "{term}"), Self::Variable(var) => write!(f, "{var}"), + #[cfg(feature = "rdf-star")] Self::Triple(triple) => triple.fmt_sse(f), } } @@ -599,6 +601,7 @@ impl fmt::Display for GroundTermPattern { Self::NamedNode(term) => term.fmt(f), Self::Literal(term) => term.fmt(f), Self::Variable(var) => var.fmt(f), + #[cfg(feature = "rdf-star")] Self::Triple(triple) => write!(f, "<<{triple}>>"), } } @@ -618,6 +621,7 @@ impl From for GroundTermPattern { } } +#[cfg(feature = "rdf-star")] impl From for GroundTermPattern { #[inline] fn from(triple: GroundTriplePattern) -> Self { @@ -818,6 +822,7 @@ pub struct GroundTriplePattern { impl GroundTriplePattern { /// Formats using the [SPARQL S-Expression syntax](https://jena.apache.org/documentation/notes/sse.html). + #[allow(dead_code)] pub(crate) fn fmt_sse(&self, f: &mut impl Write) -> fmt::Result { write!(f, "(triple ")?; self.subject.fmt_sse(f)?;