Skip to content

Commit

Permalink
update MownStr to 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@KonradHoeffner @pchampin
KonradHoeffner authored and pchampin committed Oct 7, 2024
1 parent a595813 commit ea385a6
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ env_logger = "0.11.3"
futures-util = "0.3.28"
lazy_static = "1.4.0"
log = "0.4.21"
mownstr = "0.2.1"
mownstr = "0.3.0"
oxiri = "0.2.2"
regex = "1.6.0"
resiter = "0.5.0"
Expand Down
4 changes: 2 additions & 2 deletions api/src/term/_native_iri.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ where
TermKind::Iri
}
fn iri(&self) -> Option<IriRef<MownStr<'_>>> {
Some(IriRef::new_unchecked(MownStr::from_str(self.as_str())))
Some(IriRef::new_unchecked(MownStr::from_ref(self.as_str())))
}
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
self
Expand All @@ -30,7 +30,7 @@ where
TermKind::Iri
}
fn iri(&self) -> Option<IriRef<MownStr<'_>>> {
Some(IriRef::new_unchecked(MownStr::from_str(self.as_str())))
Some(IriRef::new_unchecked(MownStr::from_ref(self.as_str())))
}
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
self
Expand Down
12 changes: 6 additions & 6 deletions api/src/term/_native_literal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl Term for f64 {
Some(MownStr::from(format!("{}", self)))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_DOUBLE)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_DOUBLE)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down Expand Up @@ -70,7 +70,7 @@ impl Term for i32 {
Some(MownStr::from(format!("{}", self)))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down Expand Up @@ -107,7 +107,7 @@ impl Term for isize {
Some(MownStr::from(format!("{}", self)))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down Expand Up @@ -144,7 +144,7 @@ impl Term for usize {
Some(MownStr::from(format!("{}", self)))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down Expand Up @@ -180,7 +180,7 @@ impl Term for str {
Some(MownStr::from(self))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_STRING)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_STRING)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down Expand Up @@ -216,7 +216,7 @@ impl Term for bool {
Some(MownStr::from(if *self { "true" } else { "false" }))
}
fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_BOOLEAN)))
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_BOOLEAN)))
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
None
Expand Down
36 changes: 18 additions & 18 deletions api/src/term/_simple.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ impl<'a> Term for SimpleTerm<'a> {
fn datatype(&self) -> Option<IriRef<MownStr>> {
match self {
LiteralDatatype(_, iri) => Some(IriRef::new_unchecked(iri.borrowed())),
LiteralLanguage(..) => Some(IriRef::new_unchecked(MownStr::from_str(&RDF_LANG_STRING))),
LiteralLanguage(..) => Some(IriRef::new_unchecked(MownStr::from_ref(&RDF_LANG_STRING))),
_ => None,
}
}
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
if let LiteralLanguage(_, tag) = self {
Some(LanguageTag::new_unchecked(MownStr::from_str(tag)))
Some(LanguageTag::new_unchecked(MownStr::from_ref(tag)))
} else {
None
}
}
fn variable(&self) -> Option<VarName<MownStr>> {
if let Variable(name) = self {
Some(VarName::new_unchecked(MownStr::from_str(name)))
Some(VarName::new_unchecked(MownStr::from_ref(name)))
} else {
None
}
Expand Down Expand Up @@ -224,7 +224,7 @@ mod test {

#[test]
fn iri_from_scratch() {
let value = IriRef::new_unchecked(MownStr::from_str("http://example.org/"));
let value = IriRef::new_unchecked(MownStr::from_ref("http://example.org/"));
let t = SimpleTerm::Iri(value.clone());
assert_consistent_term_impl(&t);
assert_eq!(t.borrow_term(), &t);
Expand All @@ -234,7 +234,7 @@ mod test {

#[test]
fn bnode_from_scratch() {
let value = BnodeId::new_unchecked(MownStr::from_str("b1"));
let value = BnodeId::new_unchecked(MownStr::from_ref("b1"));
let t = SimpleTerm::BlankNode(value.clone());
assert_consistent_term_impl(&t);
assert_eq!(t.borrow_term(), &t);
Expand All @@ -244,8 +244,8 @@ mod test {

#[test]
fn literal_dt_from_scratch() {
let value = MownStr::from_str("hello world");
let datatype = IriRef::new_unchecked(MownStr::from_str("http://example.org/"));
let value = MownStr::from_ref("hello world");
let datatype = IriRef::new_unchecked(MownStr::from_ref("http://example.org/"));
let t = SimpleTerm::LiteralDatatype(value.clone(), datatype.clone());
assert_consistent_term_impl(&t);
assert_eq!(t.borrow_term(), &t);
Expand All @@ -256,8 +256,8 @@ mod test {

#[test]
fn literal_lang_from_scratch() {
let value = MownStr::from_str("hello world");
let tag = LanguageTag::new_unchecked(MownStr::from_str("en-US"));
let value = MownStr::from_ref("hello world");
let tag = LanguageTag::new_unchecked(MownStr::from_ref("en-US"));
let t = SimpleTerm::LiteralLanguage(value.clone(), tag.clone());
assert_consistent_term_impl(&t);
assert_eq!(t.borrow_term(), &t);
Expand All @@ -268,7 +268,7 @@ mod test {

#[test]
fn variable_from_scratch() {
let value = VarName::new_unchecked(MownStr::from_str("x"));
let value = VarName::new_unchecked(MownStr::from_ref("x"));
let t = SimpleTerm::Variable(value.clone());
assert_consistent_term_impl(&t);
assert_eq!(t.borrow_term(), &t);
Expand All @@ -278,8 +278,8 @@ mod test {

#[test]
fn triple_from_scratch() {
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
let o: SimpleTerm<'_> = "o".into_term();
let spo = [s.clone(), p.clone(), o.clone()];
let t = SimpleTerm::Triple(Box::new(spo.clone()));
Expand All @@ -302,8 +302,8 @@ mod test {

#[test]
fn nested_triple_from_scratch() {
let s1: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
let p1: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
let s1: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
let p1: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
let o1: SimpleTerm<'_> = "o".into_term();
let spo1 = [s1.clone(), p1.clone(), o1.clone()];
let t1 = SimpleTerm::Triple(Box::new(spo1));
Expand Down Expand Up @@ -366,8 +366,8 @@ mod test {

#[test]
fn triple_from_term() {
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
let o: SimpleTerm<'_> = "o".into_term();
let spo = [s.clone(), p.clone(), o.clone()];
let tr = SimpleTerm::from_triple(spo.spo());
Expand Down Expand Up @@ -439,8 +439,8 @@ mod test {

#[test]
fn triple_from_term_ref() {
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
let o: SimpleTerm<'_> = "o".into_term();
let spo = [s.clone(), p.clone(), o.clone()];
let tr = SimpleTerm::from_triple(spo.spo());
Expand Down
2 changes: 1 addition & 1 deletion api/src/term/bnode_id.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ where
TermKind::BlankNode
}
fn bnode_id(&self) -> Option<BnodeId<MownStr>> {
Some(self.as_ref().map_unchecked(MownStr::from_str))
Some(self.as_ref().map_unchecked(MownStr::from_ref))
}
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
self
Expand Down
2 changes: 1 addition & 1 deletion api/src/term/var_name.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ where
TermKind::Variable
}
fn variable(&self) -> Option<VarName<MownStr>> {
Some(self.as_ref().map_unchecked(MownStr::from_str))
Some(self.as_ref().map_unchecked(MownStr::from_ref))
}
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
self
Expand Down
4 changes: 2 additions & 2 deletions jsonld/src/parser/adapter.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl SophiaTerm for RdfTerm {

fn lexical_form(&self) -> Option<MownStr> {
match &self.0 {
Term::Literal(lit) => Some(MownStr::from_str(lit.value())),
Term::Literal(lit) => Some(MownStr::from_ref(lit.value())),
_ => None,
}
}
Expand All @@ -61,7 +61,7 @@ impl SophiaTerm for RdfTerm {
fn language_tag(&self) -> Option<sophia_api::term::LanguageTag<MownStr>> {
match &self.0 {
Term::Literal(lit) => match lit.type_() {
Type::LangString(tag) => Some(tag.as_ref().map_unchecked(MownStr::from_str)),
Type::LangString(tag) => Some(tag.as_ref().map_unchecked(MownStr::from_ref)),
Type::Any(_) => None,
},
_ => None,
Expand Down
2 changes: 1 addition & 1 deletion jsonld/src/vocabulary.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,6 @@ impl Term for ArcBnode {
}

fn bnode_id(&self) -> Option<BnodeId<sophia_api::MownStr>> {
Some(BnodeId::new_unchecked(MownStr::from_str(&self[2..])))
Some(BnodeId::new_unchecked(MownStr::from_ref(&self[2..])))
}
}
6 changes: 3 additions & 3 deletions term/src/_generic.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ impl<T: Borrow<str> + Debug> Term for GenericLiteral<T> {
}

fn lexical_form(&self) -> Option<MownStr> {
Some(MownStr::from_str(self.get_lexical_form()))
Some(MownStr::from_ref(self.get_lexical_form()))
}

fn datatype(&self) -> Option<IriRef<MownStr>> {
Some(self.get_datatype().map_unchecked(MownStr::from_str))
Some(self.get_datatype().map_unchecked(MownStr::from_ref))
}

fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
self.get_language_tag()
.map(|tag| tag.map_unchecked(MownStr::from_str))
.map(|tag| tag.map_unchecked(MownStr::from_ref))
}
}

Expand Down
6 changes: 3 additions & 3 deletions term/src/_macro.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ macro_rules! gen_term {

fn iri(&self) -> Option<IriRef<MownStr>> {
if let $type_name::Iri(iri) = self {
Some(iri.as_ref().map_unchecked(MownStr::from_str))
Some(iri.as_ref().map_unchecked(MownStr::from_ref))
} else {
None
}
}

fn bnode_id(&self) -> Option<BnodeId<MownStr>> {
if let $type_name::BlankNode(id) = self {
Some(id.as_ref().map_unchecked(MownStr::from_str))
Some(id.as_ref().map_unchecked(MownStr::from_ref))
} else {
None
}
Expand Down Expand Up @@ -112,7 +112,7 @@ macro_rules! gen_term {

fn variable(&self) -> Option<VarName<MownStr>> {
if let $type_name::Variable(name) = self {
Some(name.as_ref().map_unchecked(MownStr::from_str))
Some(name.as_ref().map_unchecked(MownStr::from_ref))
} else {
None
}
Expand Down

0 comments on commit ea385a6

Please sign in to comment.