Upgrades quick-xml

Author: Tpt

Cargo.toml

@@ -5,6 +5,7 @@ members = [
     "testsuite",
     "xml"
 ]
+resolver = "2"
 
 [patch.crates-io]
 rio_api = { path = "api" }

testsuite/Cargo.toml

@@ -19,7 +19,7 @@ oxiri = "0.2"
 permutohedron = "0.2"
 
 [dev-dependencies]
-criterion = "0.4"
+criterion = "0.5"
 
 [features]
 default = []

testsuite/rdf-tests

@@ -16,10 +16,10 @@ pub struct Test {
 impl fmt::Display for Test {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.kind)?;
-        for name in &self.name {
+        if let Some(name) = &self.name {
             write!(f, " named \"{}\"", name)?;
         }
-        for comment in &self.comment {
+        if let Some(comment) = &self.comment {
             write!(f, " with comment \"{}\"", comment)?;
         }
         write!(f, " on file \"{}\"", self.action)?;

testsuite/src/manifest.rs

@@ -5,7 +5,6 @@ use oxiri::Iri;
 use rio_api::model::*;
 use std::char;
 use std::io::BufRead;
-use std::u8;
 
 pub const MAX_ASCII: u8 = 0x7F;
 

turtle/src/shared.rs

@@ -4,7 +4,6 @@ use rio_api::parser::LineBytePosition;
 use std::collections::VecDeque;
 use std::io::{BufRead, ErrorKind, Read};
 use std::str;
-use std::u8;
 
 /// Reads the file in streaming
 pub struct LookAheadByteReader<R: Read> {

turtle/src/utils.rs

@@ -22,4 +22,4 @@ default = []
 oxilangtag = "0.1"
 oxiri = "0.2"
 rio_api = { version = "0.8", path="../api" }
-quick-xml = "0.28"
+quick-xml = "0.36"

xml/Cargo.toml

@@ -99,9 +99,6 @@ impl From<RdfXmlError> for io::Error {
         match error.kind {
             RdfXmlErrorKind::Xml(error) => match error {
                 quick_xml::Error::Io(error) => io::Error::new(error.kind(), error),
-                quick_xml::Error::UnexpectedEof(error) => {
-                    io::Error::new(io::ErrorKind::UnexpectedEof, error)
-                }
                 error => io::Error::new(io::ErrorKind::InvalidData, error),
             },
             RdfXmlErrorKind::Other(error) => io::Error::new(io::ErrorKind::InvalidData, error),

xml/src/error.rs

@@ -1,20 +1,20 @@
-use quick_xml::events::*;
-use quick_xml::{NsReader, Writer};
-use rio_api::model::*;
-use rio_api::parser::TriplesParser;
-use std::convert::TryInto;
-use std::io::BufRead;
-use std::str;
-
 use crate::error::{RdfXmlError, RdfXmlErrorKind};
 use crate::model::*;
 use crate::utils::*;
 use oxilangtag::LanguageTag;
 use oxiri::Iri;
+use quick_xml::escape::resolve_xml_entity;
 use quick_xml::escape::unescape_with;
 use quick_xml::events::attributes::Attribute;
+use quick_xml::events::*;
 use quick_xml::name::{LocalName, QName, ResolveResult};
+use quick_xml::{NsReader, Writer};
+use rio_api::model::*;
+use rio_api::parser::TriplesParser;
 use std::collections::{HashMap, HashSet};
+use std::convert::TryInto;
+use std::io::BufRead;
+use std::str;
 
 /// A [RDF/XML](https://www.w3.org/TR/rdf-syntax-grammar/) streaming parser.
 ///
@@ -63,7 +63,7 @@ impl<R: BufRead> RdfXmlParser<R> {
     /// Builds the parser from a `BufRead` implementation, and a base IRI for relative IRI resolution.
     pub fn new(reader: R, base_iri: Option<Iri<String>>) -> Self {
         let mut reader = NsReader::from_reader(reader);
-        reader.expand_empty_elements(true);
+        reader.config_mut().expand_empty_elements = true;
         Self {
             reader: RdfXmlReader {
                 reader,
@@ -80,7 +80,7 @@ impl<R: BufRead> RdfXmlParser<R> {
 
     /// The current byte position in the input data.
     pub fn buffer_position(&self) -> usize {
-        self.reader.reader.buffer_position()
+        self.reader.reader.buffer_position().try_into().unwrap()
     }
 }
 
@@ -1021,7 +1021,7 @@ impl<R: BufRead> RdfXmlReader<R> {
 
     fn convert_attribute(&self, attribute: Attribute) -> Result<String, RdfXmlError> {
         Ok(attribute
-            .decode_and_unescape_value_with(&self.reader, |e| self.resolve_entity(e))?
+            .decode_and_unescape_value_with(self.reader.decoder(), |e| self.resolve_entity(e))?
             .to_string())
     }
 
@@ -1036,7 +1036,7 @@ impl<R: BufRead> RdfXmlReader<R> {
     }
 
     fn resolve_entity(&self, e: &str) -> Option<&str> {
-        self.custom_entities.get(e).map(|e| e.as_str())
+        resolve_xml_entity(e).or_else(|| self.custom_entities.get(e).map(String::as_str))
     }
 }