couple minor updates to xml deps (#7311)

# Description

Just some minor updates to xml deps

# User-Facing Changes

_(List of all changes that impact the user experience here. This helps
us keep track of breaking changes.)_

# Tests + Formatting

Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass

# After Submitting

If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
This commit is contained in:
JT
2022-12-02 08:25:13 +13:00
committed by GitHub
parent 64a028cc76
commit 0621ab6652
4 changed files with 21 additions and 29 deletions

View File

@ -32,7 +32,7 @@ alphanumeric-sort = "1.4.4"
base64 = "0.13.0"
byteorder = "1.4.3"
bytesize = "1.1.0"
calamine = "0.18.0"
calamine = "0.19.1"
chrono = { version = "0.4.23", features = ["unstable-locales", "std"], default-features = false }
chrono-humanize = "0.2.1"
chrono-tz = "0.6.3"
@ -65,11 +65,11 @@ num-traits = "0.2.14"
once_cell = "1.0"
pathdiff = "0.2.1"
powierza-coefficient = "1.0.1"
quick-xml = "0.23.0"
quick-xml = "0.25"
rand = "0.8"
rayon = "1.5.1"
reqwest = {version = "0.11", features = ["blocking", "json"] }
roxmltree = "0.14.0"
roxmltree = "0.16.0"
rust-embed = "6.3.0"
same-file = "1.0.6"
serde = { version="1.0.123", features=["derive"] }

View File

@ -124,7 +124,8 @@ fn from_node_to_value(n: &roxmltree::Node, span: Span) -> Value {
let mut collected = IndexMap::new();
let attribute_value: Value = from_attributes_to_value(n.attributes(), span);
let attribute_value: Value =
from_attributes_to_value(&n.attributes().collect::<Vec<_>>(), span);
let mut row = IndexMap::new();
row.insert(

View File

@ -117,7 +117,7 @@ pub fn write_xml_events<W: Write>(
match current {
Value::Record { cols, vals, span } => {
for (k, v) in cols.iter().zip(vals.iter()) {
let mut e = BytesStart::owned(k.as_bytes(), k.len());
let mut e = BytesStart::new(k);
if !is_xml_row(v) {
return Err(ShellError::GenericError(
"Expected a row with 'children' and 'attributes' columns".to_string(),
@ -141,7 +141,7 @@ pub fn write_xml_events<W: Write>(
}
}
writer
.write_event(Event::End(BytesEnd::borrowed(k.as_bytes())))
.write_event(Event::End(BytesEnd::new(k)))
.expect("Couldn't close XML node");
}
}
@ -153,7 +153,7 @@ pub fn write_xml_events<W: Write>(
_ => {
let s = current.into_abbreviated_string(config);
writer
.write_event(Event::Text(BytesText::from_plain_str(s.as_str())))
.write_event(Event::Text(BytesText::from_escaped(s.as_str())))
.expect("Couldn't write XML text");
}
}