1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
|
Description: use newer minor version of crate quick-xml
Author: Jonas Smedegaard <dr@jones.dk>
Bug-Debian: https://bugs.debian.org/1086507
Last-Update: 2025-11-02
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,7 @@
pkg-config = "0.3.25"
predicates = ">=2.0, <4.0"
pyo3 = "0.27"
-quick-xml = "0.37"
+quick-xml = ">= 0.37, <= 0.38"
rand = "0.9"
rayon = "1.8.1"
rayon-core = "1.12.1"
--- a/lib/oxrdfxml/src/parser.rs
+++ b/lib/oxrdfxml/src/parser.rs
@@ -803,7 +803,8 @@
Event::Eof => {
self.is_end = true;
Ok(())
- }
+ },
+ Event::GeneralRef(_) => Ok(())
}
}
@@ -1219,7 +1220,7 @@
}
fn parse_text_event(&mut self, event: &BytesText<'_>) -> Result<(), RdfXmlParseError> {
- let text = event.unescape_with(|e| self.resolve_entity(e))?.to_string();
+ let text = event.decode()?.to_string();
match self.state.last_mut() {
Some(RdfXmlState::PropertyElt { object, .. }) => {
if is_object_defined(object) {
--- a/lib/sparesults/src/xml.rs
+++ b/lib/sparesults/src/xml.rs
@@ -560,7 +560,7 @@
ResultsState::Boolean => Err(QueryResultsSyntaxError::msg(format!("Unexpected tag inside of <boolean> tag: <{}>", self.decoder.decode(event.name().as_ref())?)).into())
},
Event::Text(event) => {
- let value = event.unescape()?;
+ let value = event.decode()?;
match self.state {
ResultsState::Boolean => {
if value == "true" {
@@ -595,6 +595,9 @@
)
.into())
}
+ Event::GeneralRef(_) => {
+ Ok(None)
+ }
}
}
}
@@ -759,7 +762,7 @@
.into()),
},
Event::Text(event) => {
- let data = event.unescape()?;
+ let data = event.decode()?;
match self.state_stack.last() {
Some(State::Uri) => {
self.term = Some(
@@ -928,6 +931,9 @@
"<![CDATA[...]]> are not supported in SPARQL XML results",
)
.into()),
+ Event::GeneralRef(_) => {
+ Ok(None)
+ }
}
}
}
|