mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
CHORE: cleanup quick-xml deprecation
This commit is contained in:
parent
aa3c363548
commit
6d26705c5e
2 changed files with 54 additions and 53 deletions
|
|
@ -9,5 +9,5 @@ edition = "2018"
|
|||
|
||||
# Dependency versions enforced by Cargo.lock.
|
||||
[dependencies]
|
||||
quick-xml = "0.19.0"
|
||||
quick-xml = "0.28.1"
|
||||
convert_case = "0.4.0"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use quick_xml::events::Event;
|
||||
use quick_xml::Reader;
|
||||
use quick_xml::name::QName;
|
||||
use std::collections::HashMap;
|
||||
use std::io::{BufRead, BufReader, Read, Write};
|
||||
|
||||
|
|
@ -112,11 +113,12 @@ fn parse_usize(value: &[u8]) -> Result<usize, ParseError> {
|
|||
fn extract_contents<T: BufRead>(reader: &mut Reader<T>) -> Result<String, ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
let contents = reader
|
||||
.read_event(&mut buf)
|
||||
.read_event_into(&mut buf)
|
||||
.map_err(|_| ParseError::UnexpectedTag)?;
|
||||
match contents {
|
||||
Event::Text(t) => t
|
||||
.unescape_and_decode(reader)
|
||||
.unescape()
|
||||
.map(|s| s.to_string())
|
||||
.map_err(|_| ParseError::NonUTF8),
|
||||
_ => Err(ParseError::UnexpectedTag),
|
||||
}
|
||||
|
|
@ -128,12 +130,11 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
|
|||
let mut lsb = None;
|
||||
let mut msb = None;
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let tag_name = e
|
||||
.unescape_and_decode(reader)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name.as_str() {
|
||||
let tag_binding = e.name().as_ref().to_vec();
|
||||
let tag_name = std::str::from_utf8(&tag_binding).unwrap();
|
||||
match tag_name {
|
||||
"name" => name = Some(extract_contents(reader)?),
|
||||
"lsb" => lsb = Some(parse_usize(extract_contents(reader)?.as_bytes())?),
|
||||
"msb" => msb = Some(parse_usize(extract_contents(reader)?.as_bytes())?),
|
||||
|
|
@ -141,7 +142,7 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
|
|||
}
|
||||
}
|
||||
Ok(Event::End(ref e)) => {
|
||||
if let b"field" = e.name() {
|
||||
if let b"field" = e.local_name().as_ref() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -163,12 +164,12 @@ fn generate_fields<T: BufRead>(
|
|||
) -> Result<(), ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.local_name().as_ref() {
|
||||
b"field" => fields.push(generate_field(reader)?),
|
||||
_ => panic!("unexpected tag in <field>: {:?}", e),
|
||||
},
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
Ok(Event::End(ref e)) => match e.local_name().as_ref() {
|
||||
b"fields" => {
|
||||
// println!("End fields");
|
||||
break;
|
||||
|
|
@ -189,12 +190,12 @@ fn generate_register<T: BufRead>(reader: &mut Reader<T>) -> Result<Register, Par
|
|||
let description = None;
|
||||
let mut fields = vec![];
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let tag_name = e
|
||||
.unescape_and_decode(reader)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name.as_str() {
|
||||
let tag_binding = e.local_name().as_ref().to_vec();
|
||||
let tag_name = std::str::from_utf8(&tag_binding)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name {
|
||||
"name" => name = Some(extract_contents(reader)?),
|
||||
"addressOffset" => {
|
||||
offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?)
|
||||
|
|
@ -204,7 +205,7 @@ fn generate_register<T: BufRead>(reader: &mut Reader<T>) -> Result<Register, Par
|
|||
}
|
||||
}
|
||||
Ok(Event::End(ref e)) => {
|
||||
if let b"register" = e.name() {
|
||||
if let b"register" = e.local_name().as_ref() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -229,19 +230,19 @@ fn generate_interrupts<T: BufRead>(
|
|||
let mut name = None;
|
||||
let mut value = None;
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let tag_name = e
|
||||
.unescape_and_decode(reader)
|
||||
let tag_binding = e.local_name().as_ref().to_vec();
|
||||
let tag_name = std::str::from_utf8(&tag_binding)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name.as_str() {
|
||||
match tag_name {
|
||||
"name" => name = Some(extract_contents(reader)?),
|
||||
"value" => value = Some(parse_usize(extract_contents(reader)?.as_bytes())?),
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
Ok(Event::End(ref e)) => {
|
||||
if let b"interrupt" = e.name() {
|
||||
if let b"interrupt" = e.local_name().as_ref() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -264,12 +265,12 @@ fn generate_registers<T: BufRead>(
|
|||
) -> Result<(), ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.local_name().as_ref() {
|
||||
b"register" => registers.push(generate_register(reader)?),
|
||||
_ => panic!("unexpected tag in <registers>: {:?}", e),
|
||||
},
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
Ok(Event::End(ref e)) => match e.local_name().as_ref() {
|
||||
b"registers" => {
|
||||
break;
|
||||
}
|
||||
|
|
@ -290,12 +291,12 @@ fn generate_peripheral<T: BufRead>(reader: &mut Reader<T>) -> Result<Peripheral,
|
|||
let mut registers = vec![];
|
||||
let mut interrupts = vec![];
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let tag_name = e
|
||||
.unescape_and_decode(reader)
|
||||
let tag_binding = e.local_name().as_ref().to_vec();
|
||||
let tag_name = std::str::from_utf8(&tag_binding)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name.as_str() {
|
||||
match tag_name {
|
||||
"name" => name = Some(extract_contents(reader)?),
|
||||
"baseAddress" => {
|
||||
base = Some(parse_usize(extract_contents(reader)?.as_bytes())?)
|
||||
|
|
@ -307,7 +308,7 @@ fn generate_peripheral<T: BufRead>(reader: &mut Reader<T>) -> Result<Peripheral,
|
|||
}
|
||||
}
|
||||
Ok(Event::End(ref e)) => {
|
||||
if let b"peripheral" = e.name() {
|
||||
if let b"peripheral" = e.local_name().as_ref() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -329,12 +330,12 @@ fn generate_peripherals<T: BufRead>(reader: &mut Reader<T>) -> Result<Vec<Periph
|
|||
let mut buf = Vec::new();
|
||||
let mut peripherals = vec![];
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.local_name().as_ref() {
|
||||
b"peripheral" => peripherals.push(generate_peripheral(reader)?),
|
||||
_ => panic!("unexpected tag in <peripherals>: {:?}", e),
|
||||
},
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
Ok(Event::End(ref e)) => match e.local_name().as_ref() {
|
||||
b"peripherals" => {
|
||||
break;
|
||||
}
|
||||
|
|
@ -354,12 +355,12 @@ fn generate_memory_region<T: BufRead>(reader: &mut Reader<T>) -> Result<MemoryRe
|
|||
let mut size = None;
|
||||
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let tag_name = e
|
||||
.unescape_and_decode(reader)
|
||||
let tag_binding = e.local_name().as_ref().to_vec();
|
||||
let tag_name = std::str::from_utf8(&tag_binding)
|
||||
.map_err(|_| ParseError::NonUTF8)?;
|
||||
match tag_name.as_str() {
|
||||
match tag_name {
|
||||
"name" => name = Some(extract_contents(reader)?),
|
||||
"baseAddress" => {
|
||||
base = Some(parse_usize(extract_contents(reader)?.as_bytes())?)
|
||||
|
|
@ -369,7 +370,7 @@ fn generate_memory_region<T: BufRead>(reader: &mut Reader<T>) -> Result<MemoryRe
|
|||
}
|
||||
}
|
||||
Ok(Event::End(ref e)) => {
|
||||
if let b"memoryRegion" = e.name() {
|
||||
if let b"memoryRegion" = e.local_name().as_ref() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -391,15 +392,15 @@ fn parse_memory_regions<T: BufRead>(
|
|||
) -> Result<(), ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
b"memoryRegion" => description
|
||||
QName(b"memoryRegion") => description
|
||||
.memory_regions
|
||||
.push(generate_memory_region(reader)?),
|
||||
_ => panic!("unexpected tag in <memoryRegions>: {:?}", e),
|
||||
},
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
b"memoryRegions" => {
|
||||
QName(b"memoryRegions") => {
|
||||
break;
|
||||
}
|
||||
e => panic!("unhandled value: {:?}", e),
|
||||
|
|
@ -417,14 +418,14 @@ fn generate_constants<T: BufRead>(
|
|||
) -> Result<(), ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Empty(ref e)) => match e.name() {
|
||||
b"constant" => {
|
||||
QName(b"constant") => {
|
||||
let mut constant_descriptor = Constant::default();
|
||||
for maybe_att in e.attributes() {
|
||||
match maybe_att {
|
||||
Ok(att) => {
|
||||
let att_name = String::from_utf8(att.key.to_vec())
|
||||
let att_name = String::from_utf8(att.key.local_name().as_ref().into())
|
||||
.expect("constant: error parsing attribute name");
|
||||
let att_value = String::from_utf8(att.value.to_vec())
|
||||
.expect("constant: error parsing attribute value");
|
||||
|
|
@ -451,7 +452,7 @@ fn generate_constants<T: BufRead>(
|
|||
// if there are no attributes, the attribute iterator would do nothing; and if there are no
|
||||
// child elements, the recursive descent would also do nothing.
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
b"constants" => break,
|
||||
QName(b"constants") => break,
|
||||
e => panic!("unhandled value: {:?}", e),
|
||||
},
|
||||
Ok(Event::Text(_)) => (),
|
||||
|
|
@ -467,14 +468,14 @@ fn parse_vendor_extensions<T: BufRead>(
|
|||
) -> Result<(), ParseError> {
|
||||
let mut buf = Vec::new();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
b"memoryRegions" => parse_memory_regions(reader, description)?,
|
||||
b"constants" => generate_constants(reader, description)?,
|
||||
QName(b"memoryRegions") => parse_memory_regions(reader, description)?,
|
||||
QName(b"constants") => generate_constants(reader, description)?,
|
||||
_ => panic!("unexpected tag in <vendorExtensions>: {:?}", e),
|
||||
},
|
||||
Ok(Event::End(ref e)) => match e.name() {
|
||||
b"vendorExtensions" => {
|
||||
QName(b"vendorExtensions") => {
|
||||
break;
|
||||
}
|
||||
e => panic!("unhandled value: {:?}", e),
|
||||
|
|
@ -628,12 +629,12 @@ pub fn parse_svd<T: Read>(src: T) -> Result<Description, ParseError> {
|
|||
let mut reader = Reader::from_reader(buf_reader);
|
||||
let mut description = Description::default();
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
match reader.read_event_into(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => match e.name() {
|
||||
b"peripherals" => {
|
||||
QName(b"peripherals") => {
|
||||
description.peripherals = generate_peripherals(&mut reader)?;
|
||||
}
|
||||
b"vendorExtensions" => {
|
||||
QName(b"vendorExtensions") => {
|
||||
parse_vendor_extensions(&mut reader, &mut description)?;
|
||||
}
|
||||
_ => (),
|
||||
|
|
|
|||
Loading…
Reference in a new issue