diff --git a/fuzz/fuzz_targets/nquads.rs b/fuzz/fuzz_targets/nquads.rs index 80cf9160..b8b1ac6e 100644 --- a/fuzz/fuzz_targets/nquads.rs +++ b/fuzz/fuzz_targets/nquads.rs @@ -33,7 +33,7 @@ fuzz_target!(|data: &[u8]| { // We parse the serialization let new_quads = NQuadsParser::new() .with_quoted_triples() - .parse_from_read(new_serialization.as_slice()) + .parse_read(new_serialization.as_slice()) .collect::, _>>() .map_err(|e| { format!( diff --git a/fuzz/fuzz_targets/rdf_xml.rs b/fuzz/fuzz_targets/rdf_xml.rs index ae0cb6b1..e1efc7e9 100644 --- a/fuzz/fuzz_targets/rdf_xml.rs +++ b/fuzz/fuzz_targets/rdf_xml.rs @@ -6,7 +6,7 @@ use oxrdfxml::{RdfXmlParser, RdfXmlSerializer}; fuzz_target!(|data: &[u8]| { // We parse let mut triples = Vec::new(); - for triple in RdfXmlParser::new().parse_from_read(data) { + for triple in RdfXmlParser::new().parse_read(data) { if let Ok(triple) = triple { triples.push(triple); } @@ -21,7 +21,7 @@ fuzz_target!(|data: &[u8]| { // We parse the serialization let new_triples = RdfXmlParser::new() - .parse_from_read(new_serialization.as_slice()) + .parse_read(new_serialization.as_slice()) .collect::, _>>() .map_err(|e| { format!( diff --git a/fuzz/fuzz_targets/trig.rs b/fuzz/fuzz_targets/trig.rs index 9c2385df..e6ed06c7 100644 --- a/fuzz/fuzz_targets/trig.rs +++ b/fuzz/fuzz_targets/trig.rs @@ -37,7 +37,7 @@ fuzz_target!(|data: &[u8]| { // We parse the serialization let new_quads = TriGParser::new() .with_quoted_triples() - .parse_from_read(new_serialization.as_slice()) + .parse_read(new_serialization.as_slice()) .collect::, _>>() .map_err(|e| { format!( diff --git a/lib/oxrdfxml/README.md b/lib/oxrdfxml/README.md index 66f9f563..d2c0390d 100644 --- a/lib/oxrdfxml/README.md +++ b/lib/oxrdfxml/README.md @@ -25,7 +25,7 @@ let file = b" let schema_person = NamedNodeRef::new("http://schema.org/Person").unwrap(); let mut count = 0; -for triple in RdfXmlParser::new().parse_from_read(file.as_ref()) { +for triple in RdfXmlParser::new().parse_read(file.as_ref()) { let triple = triple.unwrap(); if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { count += 1; diff --git a/lib/oxrdfxml/src/parser.rs b/lib/oxrdfxml/src/parser.rs index 999becad..ddb11fd3 100644 --- a/lib/oxrdfxml/src/parser.rs +++ b/lib/oxrdfxml/src/parser.rs @@ -40,7 +40,7 @@ use tokio::io::{AsyncRead, BufReader as AsyncBufReader}; /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in RdfXmlParser::new().parse_from_read(file.as_ref()) { +/// for triple in RdfXmlParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -85,7 +85,7 @@ impl RdfXmlParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; - /// for triple in RdfXmlParser::new().parse_from_read(file.as_ref()) { + /// for triple in RdfXmlParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -94,7 +94,7 @@ impl RdfXmlParser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadRdfXmlReader { + pub fn parse_read(&self, read: R) -> FromReadRdfXmlReader { FromReadRdfXmlReader { results: Vec::new(), reader: self.parse(BufReader::new(read)), @@ -122,7 +122,7 @@ impl RdfXmlParser { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; - /// let mut parser = RdfXmlParser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = RdfXmlParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { @@ -134,7 +134,7 @@ impl RdfXmlParser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadRdfXmlReader { @@ -161,7 +161,7 @@ impl RdfXmlParser { } } -/// Parses a RDF/XML file from a [`Read`] implementation. Can be built using [`RdfXmlParser::parse_from_read`]. +/// Parses a RDF/XML file from a [`Read`] implementation. Can be built using [`RdfXmlParser::parse_read`]. /// /// Count the number of people: /// ``` @@ -179,7 +179,7 @@ impl RdfXmlParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in RdfXmlParser::new().parse_from_read(file.as_ref()) { +/// for triple in RdfXmlParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -227,7 +227,7 @@ impl FromReadRdfXmlReader { } } -/// Parses a RDF/XML file from a [`AsyncRead`] implementation. Can be built using [`RdfXmlParser::parse_from_tokio_async_read`]. +/// Parses a RDF/XML file from a [`AsyncRead`] implementation. Can be built using [`RdfXmlParser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -247,7 +247,7 @@ impl FromReadRdfXmlReader { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; -/// let mut parser = RdfXmlParser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = RdfXmlParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { diff --git a/lib/oxttl/README.md b/lib/oxttl/README.md index e99dd2fc..ace0955d 100644 --- a/lib/oxttl/README.md +++ b/lib/oxttl/README.md @@ -27,7 +27,7 @@ let file = b"@base . let schema_person = NamedNodeRef::new("http://schema.org/Person").unwrap(); let mut count = 0; -for triple in TurtleParser::new().parse_from_read(file.as_ref()) { +for triple in TurtleParser::new().parse_read(file.as_ref()) { let triple = triple.unwrap(); if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { count += 1; diff --git a/lib/oxttl/src/n3.rs b/lib/oxttl/src/n3.rs index 106263a2..7167df09 100644 --- a/lib/oxttl/src/n3.rs +++ b/lib/oxttl/src/n3.rs @@ -194,7 +194,7 @@ impl From for N3Quad { /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned()); /// let schema_person = N3Term::NamedNode(NamedNode::new("http://schema.org/Person")?); /// let mut count = 0; -/// for triple in N3Parser::new().parse_from_read(file.as_ref()) { +/// for triple in N3Parser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf_type && triple.object == schema_person { /// count += 1; @@ -250,7 +250,7 @@ impl N3Parser { /// let rdf_type = N3Term::NamedNode(NamedNode::new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")?); /// let schema_person = N3Term::NamedNode(NamedNode::new("http://schema.org/Person")?); /// let mut count = 0; - /// for triple in N3Parser::new().parse_from_read(file.as_ref()) { + /// for triple in N3Parser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf_type && triple.object == schema_person { /// count += 1; @@ -259,9 +259,9 @@ impl N3Parser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadN3Reader { + pub fn parse_read(&self, read: R) -> FromReadN3Reader { FromReadN3Reader { - inner: self.parse().parser.parse_from_read(read), + inner: self.parse().parser.parse_read(read), } } @@ -285,7 +285,7 @@ impl N3Parser { /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned()); /// let schema_person = N3Term::NamedNode(NamedNode::new_unchecked("http://schema.org/Person")); /// let mut count = 0; - /// let mut parser = N3Parser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = N3Parser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf_type && triple.object == schema_person { @@ -297,12 +297,12 @@ impl N3Parser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadN3Reader { FromTokioAsyncReadN3Reader { - inner: self.parse().parser.parse_from_tokio_async_read(read), + inner: self.parse().parser.parse_tokio_async_read(read), } } @@ -350,7 +350,7 @@ impl N3Parser { } } -/// Parses a N3 file from a [`Read`] implementation. Can be built using [`N3Parser::parse_from_read`]. +/// Parses a N3 file from a [`Read`] implementation. Can be built using [`N3Parser::parse_read`]. /// /// Count the number of people: /// ``` @@ -367,7 +367,7 @@ impl N3Parser { /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned()); /// let schema_person = N3Term::NamedNode(NamedNode::new("http://schema.org/Person")?); /// let mut count = 0; -/// for triple in N3Parser::new().parse_from_read(file.as_ref()) { +/// for triple in N3Parser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf_type && triple.object == schema_person { /// count += 1; @@ -388,7 +388,7 @@ impl Iterator for FromReadN3Reader { } } -/// Parses a N3 file from a [`AsyncRead`] implementation. Can be built using [`N3Parser::parse_from_tokio_async_read`]. +/// Parses a N3 file from a [`AsyncRead`] implementation. Can be built using [`N3Parser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -408,7 +408,7 @@ impl Iterator for FromReadN3Reader { /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned()); /// let schema_person = N3Term::NamedNode(NamedNode::new_unchecked("http://schema.org/Person")); /// let mut count = 0; -/// let mut parser = N3Parser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = N3Parser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf_type && triple.object == schema_person { diff --git a/lib/oxttl/src/nquads.rs b/lib/oxttl/src/nquads.rs index 5cd27dae..140f25a7 100644 --- a/lib/oxttl/src/nquads.rs +++ b/lib/oxttl/src/nquads.rs @@ -25,7 +25,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt}; /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for quad in NQuadsParser::new().parse_from_read(file.as_ref()) { +/// for quad in NQuadsParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -70,7 +70,7 @@ impl NQuadsParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; - /// for quad in NQuadsParser::new().parse_from_read(file.as_ref()) { + /// for quad in NQuadsParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -79,9 +79,9 @@ impl NQuadsParser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadNQuadsReader { + pub fn parse_read(&self, read: R) -> FromReadNQuadsReader { FromReadNQuadsReader { - inner: self.parse().parser.parse_from_read(read), + inner: self.parse().parser.parse_read(read), } } @@ -101,7 +101,7 @@ impl NQuadsParser { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; - /// let mut parser = NQuadsParser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = NQuadsParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { @@ -113,12 +113,12 @@ impl NQuadsParser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadNQuadsReader { FromTokioAsyncReadNQuadsReader { - inner: self.parse().parser.parse_from_tokio_async_read(read), + inner: self.parse().parser.parse_tokio_async_read(read), } } @@ -170,7 +170,7 @@ impl NQuadsParser { } } -/// Parses a N-Quads file from a [`Read`] implementation. Can be built using [`NQuadsParser::parse_from_read`]. +/// Parses a N-Quads file from a [`Read`] implementation. Can be built using [`NQuadsParser::parse_read`]. /// /// Count the number of people: /// ``` @@ -184,7 +184,7 @@ impl NQuadsParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for quad in NQuadsParser::new().parse_from_read(file.as_ref()) { +/// for quad in NQuadsParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -205,7 +205,7 @@ impl Iterator for FromReadNQuadsReader { } } -/// Parses a N-Quads file from a [`AsyncRead`] implementation. Can be built using [`NQuadsParser::parse_from_tokio_async_read`]. +/// Parses a N-Quads file from a [`AsyncRead`] implementation. Can be built using [`NQuadsParser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -221,7 +221,7 @@ impl Iterator for FromReadNQuadsReader { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; -/// let mut parser = NQuadsParser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = NQuadsParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { diff --git a/lib/oxttl/src/ntriples.rs b/lib/oxttl/src/ntriples.rs index 2278db81..3014c5d8 100644 --- a/lib/oxttl/src/ntriples.rs +++ b/lib/oxttl/src/ntriples.rs @@ -26,7 +26,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt}; /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in NTriplesParser::new().parse_from_read(file.as_ref()) { +/// for triple in NTriplesParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -71,7 +71,7 @@ impl NTriplesParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; - /// for triple in NTriplesParser::new().parse_from_read(file.as_ref()) { + /// for triple in NTriplesParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -80,9 +80,9 @@ impl NTriplesParser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadNTriplesReader { + pub fn parse_read(&self, read: R) -> FromReadNTriplesReader { FromReadNTriplesReader { - inner: self.parse().parser.parse_from_read(read), + inner: self.parse().parser.parse_read(read), } } @@ -102,7 +102,7 @@ impl NTriplesParser { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; - /// let mut parser = NTriplesParser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = NTriplesParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { @@ -114,12 +114,12 @@ impl NTriplesParser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadNTriplesReader { FromTokioAsyncReadNTriplesReader { - inner: self.parse().parser.parse_from_tokio_async_read(read), + inner: self.parse().parser.parse_tokio_async_read(read), } } @@ -171,7 +171,7 @@ impl NTriplesParser { } } -/// Parses a N-Triples file from a [`Read`] implementation. Can be built using [`NTriplesParser::parse_from_read`]. +/// Parses a N-Triples file from a [`Read`] implementation. Can be built using [`NTriplesParser::parse_read`]. /// /// Count the number of people: /// ``` @@ -185,7 +185,7 @@ impl NTriplesParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in NTriplesParser::new().parse_from_read(file.as_ref()) { +/// for triple in NTriplesParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -206,7 +206,7 @@ impl Iterator for FromReadNTriplesReader { } } -/// Parses a N-Triples file from a [`AsyncRead`] implementation. Can be built using [`NTriplesParser::parse_from_tokio_async_read`]. +/// Parses a N-Triples file from a [`AsyncRead`] implementation. Can be built using [`NTriplesParser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -222,7 +222,7 @@ impl Iterator for FromReadNTriplesReader { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; -/// let mut parser = NTriplesParser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = NTriplesParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { diff --git a/lib/oxttl/src/toolkit/parser.rs b/lib/oxttl/src/toolkit/parser.rs index c5808199..38419477 100644 --- a/lib/oxttl/src/toolkit/parser.rs +++ b/lib/oxttl/src/toolkit/parser.rs @@ -113,12 +113,12 @@ impl Parser { } } - pub fn parse_from_read(self, read: R) -> FromReadIterator { + pub fn parse_read(self, read: R) -> FromReadIterator { FromReadIterator { read, parser: self } } #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( self, read: R, ) -> FromTokioAsyncReadIterator { diff --git a/lib/oxttl/src/trig.rs b/lib/oxttl/src/trig.rs index 5ad21402..146e56b4 100644 --- a/lib/oxttl/src/trig.rs +++ b/lib/oxttl/src/trig.rs @@ -30,7 +30,7 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt}; /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for quad in TriGParser::new().parse_from_read(file.as_ref()) { +/// for quad in TriGParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -96,7 +96,7 @@ impl TriGParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; - /// for quad in TriGParser::new().parse_from_read(file.as_ref()) { + /// for quad in TriGParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -105,9 +105,9 @@ impl TriGParser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadTriGReader { + pub fn parse_read(&self, read: R) -> FromReadTriGReader { FromReadTriGReader { - inner: self.parse().parser.parse_from_read(read), + inner: self.parse().parser.parse_read(read), } } @@ -129,7 +129,7 @@ impl TriGParser { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; - /// let mut parser = TriGParser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = TriGParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { @@ -141,12 +141,12 @@ impl TriGParser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadTriGReader { FromTokioAsyncReadTriGReader { - inner: self.parse().parser.parse_from_tokio_async_read(read), + inner: self.parse().parser.parse_tokio_async_read(read), } } @@ -199,7 +199,7 @@ impl TriGParser { } } -/// Parses a TriG file from a [`Read`] implementation. Can be built using [`TriGParser::parse_from_read`]. +/// Parses a TriG file from a [`Read`] implementation. Can be built using [`TriGParser::parse_read`]. /// /// Count the number of people: /// ``` @@ -215,7 +215,7 @@ impl TriGParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for quad in TriGParser::new().parse_from_read(file.as_ref()) { +/// for quad in TriGParser::new().parse_read(file.as_ref()) { /// let quad = quad?; /// if quad.predicate == rdf::TYPE && quad.object == schema_person.into() { /// count += 1; @@ -236,7 +236,7 @@ impl Iterator for FromReadTriGReader { } } -/// Parses a TriG file from a [`AsyncRead`] implementation. Can be built using [`TriGParser::parse_from_tokio_async_read`]. +/// Parses a TriG file from a [`AsyncRead`] implementation. Can be built using [`TriGParser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -254,7 +254,7 @@ impl Iterator for FromReadTriGReader { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; -/// let mut parser = TriGParser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = TriGParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { diff --git a/lib/oxttl/src/turtle.rs b/lib/oxttl/src/turtle.rs index 0c875b8a..b5a1b0cd 100644 --- a/lib/oxttl/src/turtle.rs +++ b/lib/oxttl/src/turtle.rs @@ -32,7 +32,7 @@ use tokio::io::{AsyncRead, AsyncWrite}; /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in TurtleParser::new().parse_from_read(file.as_ref()) { +/// for triple in TurtleParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -98,7 +98,7 @@ impl TurtleParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; - /// for triple in TurtleParser::new().parse_from_read(file.as_ref()) { + /// for triple in TurtleParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -107,9 +107,9 @@ impl TurtleParser { /// assert_eq!(2, count); /// # Result::<_,Box>::Ok(()) /// ``` - pub fn parse_from_read(&self, read: R) -> FromReadTurtleReader { + pub fn parse_read(&self, read: R) -> FromReadTurtleReader { FromReadTurtleReader { - inner: self.parse().parser.parse_from_read(read), + inner: self.parse().parser.parse_read(read), } } @@ -131,7 +131,7 @@ impl TurtleParser { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; - /// let mut parser = TurtleParser::new().parse_from_tokio_async_read(file.as_ref()); + /// let mut parser = TurtleParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { @@ -143,12 +143,12 @@ impl TurtleParser { /// } /// ``` #[cfg(feature = "async-tokio")] - pub fn parse_from_tokio_async_read( + pub fn parse_tokio_async_read( &self, read: R, ) -> FromTokioAsyncReadTurtleReader { FromTokioAsyncReadTurtleReader { - inner: self.parse().parser.parse_from_tokio_async_read(read), + inner: self.parse().parser.parse_tokio_async_read(read), } } @@ -201,7 +201,7 @@ impl TurtleParser { } } -/// Parses a Turtle file from a [`Read`] implementation. Can be built using [`TurtleParser::parse_from_read`]. +/// Parses a Turtle file from a [`Read`] implementation. Can be built using [`TurtleParser::parse_read`]. /// /// Count the number of people: /// ``` @@ -217,7 +217,7 @@ impl TurtleParser { /// /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?; /// let mut count = 0; -/// for triple in TurtleParser::new().parse_from_read(file.as_ref()) { +/// for triple in TurtleParser::new().parse_read(file.as_ref()) { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { /// count += 1; @@ -238,7 +238,7 @@ impl Iterator for FromReadTurtleReader { } } -/// Parses a Turtle file from a [`AsyncRead`] implementation. Can be built using [`TurtleParser::parse_from_tokio_async_read`]. +/// Parses a Turtle file from a [`AsyncRead`] implementation. Can be built using [`TurtleParser::parse_tokio_async_read`]. /// /// Count the number of people: /// ``` @@ -256,7 +256,7 @@ impl Iterator for FromReadTurtleReader { /// /// let schema_person = NamedNodeRef::new_unchecked("http://schema.org/Person"); /// let mut count = 0; -/// let mut parser = TurtleParser::new().parse_from_tokio_async_read(file.as_ref()); +/// let mut parser = TurtleParser::new().parse_tokio_async_read(file.as_ref()); /// while let Some(triple) = parser.next().await { /// let triple = triple?; /// if triple.predicate == rdf::TYPE && triple.object == schema_person.into() { diff --git a/lib/src/io/read.rs b/lib/src/io/read.rs index 3b3cadc4..eddaabed 100644 --- a/lib/src/io/read.rs +++ b/lib/src/io/read.rs @@ -88,11 +88,9 @@ impl GraphParser { TripleReader { mapper: BlankNodeMapper::default(), parser: match &self.inner { - GraphParserKind::NTriples(p) => { - TripleReaderKind::NTriples(p.parse_from_read(reader)) - } - GraphParserKind::Turtle(p) => TripleReaderKind::Turtle(p.parse_from_read(reader)), - GraphParserKind::RdfXml(p) => TripleReaderKind::RdfXml(p.parse_from_read(reader)), + GraphParserKind::NTriples(p) => TripleReaderKind::NTriples(p.parse_read(reader)), + GraphParserKind::Turtle(p) => TripleReaderKind::Turtle(p.parse_read(reader)), + GraphParserKind::RdfXml(p) => TripleReaderKind::RdfXml(p.parse_read(reader)), }, } } @@ -219,8 +217,8 @@ impl DatasetParser { QuadReader { mapper: BlankNodeMapper::default(), parser: match &self.inner { - DatasetParserKind::NQuads(p) => QuadReaderKind::NQuads(p.parse_from_read(reader)), - DatasetParserKind::TriG(p) => QuadReaderKind::TriG(p.parse_from_read(reader)), + DatasetParserKind::NQuads(p) => QuadReaderKind::NQuads(p.parse_read(reader)), + DatasetParserKind::TriG(p) => QuadReaderKind::TriG(p.parse_read(reader)), }, } } diff --git a/testsuite/src/files.rs b/testsuite/src/files.rs index 2d9914c7..9a9dc839 100644 --- a/testsuite/src/files.rs +++ b/testsuite/src/files.rs @@ -107,7 +107,7 @@ pub fn load_n3(url: &str, ignore_errors: bool) -> Result> { for q in N3Parser::new() .with_base_iri(url)? .with_prefix("", format!("{url}#"))? - .parse_from_read(read_file(url)?) + .parse_read(read_file(url)?) { match q { Ok(q) => quads.push(q),