Skip to content

Commit ea385a6

Browse files
KonradHoeffnerpchampin
KonradHoeffner
authored and
pchampin
committed
update MownStr to 0.3.0
1 parent a595813 commit ea385a6

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env_logger = "0.11.3"
4444
futures-util = "0.3.28"
4545
lazy_static = "1.4.0"
4646
log = "0.4.21"
47-
mownstr = "0.2.1"
47+
mownstr = "0.3.0"
4848
oxiri = "0.2.2"
4949
regex = "1.6.0"
5050
resiter = "0.5.0"

‎api/src/term/_native_iri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ where
1313
TermKind::Iri
1414
}
1515
fn iri(&self) -> Option<IriRef<MownStr<'_>>> {
16-
Some(IriRef::new_unchecked(MownStr::from_str(self.as_str())))
16+
Some(IriRef::new_unchecked(MownStr::from_ref(self.as_str())))
1717
}
1818
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
1919
self
@@ -30,7 +30,7 @@ where
3030
TermKind::Iri
3131
}
3232
fn iri(&self) -> Option<IriRef<MownStr<'_>>> {
33-
Some(IriRef::new_unchecked(MownStr::from_str(self.as_str())))
33+
Some(IriRef::new_unchecked(MownStr::from_ref(self.as_str())))
3434
}
3535
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
3636
self

‎api/src/term/_native_literal.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl Term for f64 {
3434
Some(MownStr::from(format!("{}", self)))
3535
}
3636
fn datatype(&self) -> Option<IriRef<MownStr>> {
37-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_DOUBLE)))
37+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_DOUBLE)))
3838
}
3939
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
4040
None
@@ -70,7 +70,7 @@ impl Term for i32 {
7070
Some(MownStr::from(format!("{}", self)))
7171
}
7272
fn datatype(&self) -> Option<IriRef<MownStr>> {
73-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
73+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
7474
}
7575
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
7676
None
@@ -107,7 +107,7 @@ impl Term for isize {
107107
Some(MownStr::from(format!("{}", self)))
108108
}
109109
fn datatype(&self) -> Option<IriRef<MownStr>> {
110-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
110+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
111111
}
112112
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
113113
None
@@ -144,7 +144,7 @@ impl Term for usize {
144144
Some(MownStr::from(format!("{}", self)))
145145
}
146146
fn datatype(&self) -> Option<IriRef<MownStr>> {
147-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_INTEGER)))
147+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_INTEGER)))
148148
}
149149
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
150150
None
@@ -180,7 +180,7 @@ impl Term for str {
180180
Some(MownStr::from(self))
181181
}
182182
fn datatype(&self) -> Option<IriRef<MownStr>> {
183-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_STRING)))
183+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_STRING)))
184184
}
185185
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
186186
None
@@ -216,7 +216,7 @@ impl Term for bool {
216216
Some(MownStr::from(if *self { "true" } else { "false" }))
217217
}
218218
fn datatype(&self) -> Option<IriRef<MownStr>> {
219-
Some(IriRef::new_unchecked(MownStr::from_str(&XSD_BOOLEAN)))
219+
Some(IriRef::new_unchecked(MownStr::from_ref(&XSD_BOOLEAN)))
220220
}
221221
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
222222
None

‎api/src/term/_simple.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@ impl<'a> Term for SimpleTerm<'a> {
5959
fn datatype(&self) -> Option<IriRef<MownStr>> {
6060
match self {
6161
LiteralDatatype(_, iri) => Some(IriRef::new_unchecked(iri.borrowed())),
62-
LiteralLanguage(..) => Some(IriRef::new_unchecked(MownStr::from_str(&RDF_LANG_STRING))),
62+
LiteralLanguage(..) => Some(IriRef::new_unchecked(MownStr::from_ref(&RDF_LANG_STRING))),
6363
_ => None,
6464
}
6565
}
6666
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
6767
if let LiteralLanguage(_, tag) = self {
68-
Some(LanguageTag::new_unchecked(MownStr::from_str(tag)))
68+
Some(LanguageTag::new_unchecked(MownStr::from_ref(tag)))
6969
} else {
7070
None
7171
}
7272
}
7373
fn variable(&self) -> Option<VarName<MownStr>> {
7474
if let Variable(name) = self {
75-
Some(VarName::new_unchecked(MownStr::from_str(name)))
75+
Some(VarName::new_unchecked(MownStr::from_ref(name)))
7676
} else {
7777
None
7878
}
@@ -224,7 +224,7 @@ mod test {
224224

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

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

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

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

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

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

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

367367
#[test]
368368
fn triple_from_term() {
369-
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
370-
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
369+
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
370+
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
371371
let o: SimpleTerm<'_> = "o".into_term();
372372
let spo = [s.clone(), p.clone(), o.clone()];
373373
let tr = SimpleTerm::from_triple(spo.spo());
@@ -439,8 +439,8 @@ mod test {
439439

440440
#[test]
441441
fn triple_from_term_ref() {
442-
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_str("s")).into_term();
443-
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_str("p")).into_term();
442+
let s: SimpleTerm<'_> = BnodeId::new_unchecked(MownStr::from_ref("s")).into_term();
443+
let p: SimpleTerm<'_> = IriRef::new_unchecked(MownStr::from_ref("p")).into_term();
444444
let o: SimpleTerm<'_> = "o".into_term();
445445
let spo = [s.clone(), p.clone(), o.clone()];
446446
let tr = SimpleTerm::from_triple(spo.spo());

‎api/src/term/bnode_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ where
6767
TermKind::BlankNode
6868
}
6969
fn bnode_id(&self) -> Option<BnodeId<MownStr>> {
70-
Some(self.as_ref().map_unchecked(MownStr::from_str))
70+
Some(self.as_ref().map_unchecked(MownStr::from_ref))
7171
}
7272
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
7373
self

‎api/src/term/var_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ where
5656
TermKind::Variable
5757
}
5858
fn variable(&self) -> Option<VarName<MownStr>> {
59-
Some(self.as_ref().map_unchecked(MownStr::from_str))
59+
Some(self.as_ref().map_unchecked(MownStr::from_ref))
6060
}
6161
fn borrow_term(&self) -> Self::BorrowTerm<'_> {
6262
self

‎jsonld/src/parser/adapter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl SophiaTerm for RdfTerm {
4343

4444
fn lexical_form(&self) -> Option<MownStr> {
4545
match &self.0 {
46-
Term::Literal(lit) => Some(MownStr::from_str(lit.value())),
46+
Term::Literal(lit) => Some(MownStr::from_ref(lit.value())),
4747
_ => None,
4848
}
4949
}
@@ -61,7 +61,7 @@ impl SophiaTerm for RdfTerm {
6161
fn language_tag(&self) -> Option<sophia_api::term::LanguageTag<MownStr>> {
6262
match &self.0 {
6363
Term::Literal(lit) => match lit.type_() {
64-
Type::LangString(tag) => Some(tag.as_ref().map_unchecked(MownStr::from_str)),
64+
Type::LangString(tag) => Some(tag.as_ref().map_unchecked(MownStr::from_ref)),
6565
Type::Any(_) => None,
6666
},
6767
_ => None,

‎jsonld/src/vocabulary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,6 @@ impl Term for ArcBnode {
140140
}
141141

142142
fn bnode_id(&self) -> Option<BnodeId<sophia_api::MownStr>> {
143-
Some(BnodeId::new_unchecked(MownStr::from_str(&self[2..])))
143+
Some(BnodeId::new_unchecked(MownStr::from_ref(&self[2..])))
144144
}
145145
}

‎term/src/_generic.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ impl<T: Borrow<str> + Debug> Term for GenericLiteral<T> {
5959
}
6060

6161
fn lexical_form(&self) -> Option<MownStr> {
62-
Some(MownStr::from_str(self.get_lexical_form()))
62+
Some(MownStr::from_ref(self.get_lexical_form()))
6363
}
6464

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

6969
fn language_tag(&self) -> Option<LanguageTag<MownStr>> {
7070
self.get_language_tag()
71-
.map(|tag| tag.map_unchecked(MownStr::from_str))
71+
.map(|tag| tag.map_unchecked(MownStr::from_ref))
7272
}
7373
}
7474

‎term/src/_macro.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ macro_rules! gen_term {
7272

7373
fn iri(&self) -> Option<IriRef<MownStr>> {
7474
if let $type_name::Iri(iri) = self {
75-
Some(iri.as_ref().map_unchecked(MownStr::from_str))
75+
Some(iri.as_ref().map_unchecked(MownStr::from_ref))
7676
} else {
7777
None
7878
}
7979
}
8080

8181
fn bnode_id(&self) -> Option<BnodeId<MownStr>> {
8282
if let $type_name::BlankNode(id) = self {
83-
Some(id.as_ref().map_unchecked(MownStr::from_str))
83+
Some(id.as_ref().map_unchecked(MownStr::from_ref))
8484
} else {
8585
None
8686
}
@@ -112,7 +112,7 @@ macro_rules! gen_term {
112112

113113
fn variable(&self) -> Option<VarName<MownStr>> {
114114
if let $type_name::Variable(name) = self {
115-
Some(name.as_ref().map_unchecked(MownStr::from_str))
115+
Some(name.as_ref().map_unchecked(MownStr::from_ref))
116116
} else {
117117
None
118118
}

0 commit comments

Comments
 (0)