From 6d26705c5e1b10ff7c294c57090f8c170528877e Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 3 May 2023 23:09:42 +0800 Subject: [PATCH] CHORE: cleanup quick-xml deprecation --- svd2repl/Cargo.toml | 2 +- svd2repl/src/generate.rs | 105 ++++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/svd2repl/Cargo.toml b/svd2repl/Cargo.toml index dfd7f2f1e..f8bf91246 100644 --- a/svd2repl/Cargo.toml +++ b/svd2repl/Cargo.toml @@ -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" diff --git a/svd2repl/src/generate.rs b/svd2repl/src/generate.rs index 941af64f7..ec8fea788 100644 --- a/svd2repl/src/generate.rs +++ b/svd2repl/src/generate.rs @@ -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 { fn extract_contents(reader: &mut Reader) -> Result { 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(reader: &mut Reader) -> Result { - 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(reader: &mut Reader) -> Result { - if let b"field" = e.name() { + if let b"field" = e.local_name().as_ref() { break; } } @@ -163,12 +164,12 @@ fn generate_fields( ) -> 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 : {:?}", 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(reader: &mut Reader) -> Result { - 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(reader: &mut Reader) -> Result { - if let b"register" = e.name() { + if let b"register" = e.local_name().as_ref() { break; } } @@ -229,19 +230,19 @@ fn generate_interrupts( 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( ) -> 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 : {:?}", 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(reader: &mut Reader) -> Result { - 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(reader: &mut Reader) -> Result { - if let b"peripheral" = e.name() { + if let b"peripheral" = e.local_name().as_ref() { break; } } @@ -329,12 +330,12 @@ fn generate_peripherals(reader: &mut Reader) -> Result 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 : {:?}", 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(reader: &mut Reader) -> Result { - 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(reader: &mut Reader) -> Result { - if let b"memoryRegion" = e.name() { + if let b"memoryRegion" = e.local_name().as_ref() { break; } } @@ -391,15 +392,15 @@ fn parse_memory_regions( ) -> 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 : {:?}", 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( ) -> 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( // 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( ) -> 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 : {:?}", 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(src: T) -> Result { 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)?; } _ => (),