diff --git a/lib/src/model/literal.rs b/lib/src/model/literal.rs index cde52a32..a5443023 100644 --- a/lib/src/model/literal.rs +++ b/lib/src/model/literal.rs @@ -2,8 +2,7 @@ use crate::model::named_node::NamedNode; use crate::model::vocab::rdf; use crate::model::vocab::xsd; use crate::model::xsd::*; -use crate::Result; -use oxilangtag::LanguageTag; +use oxilangtag::{LanguageTag, LanguageTagParseError}; use rio_api::model as rio; use std::borrow::Cow; use std::fmt; @@ -13,7 +12,7 @@ use std::option::Option; /// /// The default string formatter is returning a N-Triples, Turtle and SPARQL compatible representation: /// ``` -/// # use oxigraph::Result; +/// # use oxilangtag::LanguageTagParseError; /// use oxigraph::model::Literal; /// use oxigraph::model::vocab::xsd; /// @@ -31,7 +30,7 @@ use std::option::Option; /// "\"foo\"@en", /// Literal::new_language_tagged_literal("foo", "en")?.to_string() /// ); -/// # Result::Ok(()) +/// # Result::<(), LanguageTagParseError>::Ok(()) /// ``` #[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Hash)] pub struct Literal(LiteralContent); @@ -64,7 +63,7 @@ impl Literal { pub fn new_language_tagged_literal( value: impl Into, language: impl Into, - ) -> Result { + ) -> Result { let mut language = language.into(); language.make_ascii_lowercase(); Ok(Literal(LiteralContent::LanguageTaggedString { diff --git a/lib/src/model/named_node.rs b/lib/src/model/named_node.rs index 87723d79..aeef13e4 100644 --- a/lib/src/model/named_node.rs +++ b/lib/src/model/named_node.rs @@ -1,5 +1,4 @@ -use crate::Result; -use oxiri::Iri; +use oxiri::{Iri, IriParseError}; use rio_api::model as rio; use std::fmt; @@ -22,7 +21,7 @@ pub struct NamedNode { impl NamedNode { /// Builds and validate a RDF [IRI](https://www.w3.org/TR/rdf11-concepts/#dfn-iri) - pub fn parse(iri: impl Into) -> Result { + pub fn parse(iri: impl Into) -> Result { Ok(Self::new_from_iri(Iri::parse(iri.into())?)) } diff --git a/lib/src/sparql/xml_results.rs b/lib/src/sparql/xml_results.rs index 2e5f4dd5..c70e8fa0 100644 --- a/lib/src/sparql/xml_results.rs +++ b/lib/src/sparql/xml_results.rs @@ -434,7 +434,7 @@ fn build_literal( match datatype { Some(datatype) => Ok(Literal::new_typed_literal(value, datatype)), None => match lang { - Some(lang) => Literal::new_language_tagged_literal(value, lang), + Some(lang) => Ok(Literal::new_language_tagged_literal(value, lang)?), None => Ok(Literal::new_simple_literal(value)), }, }