From cb6f82e2b7d7d4e5bc9d11206a892cb549e9baa6 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Sat, 6 Apr 2024 13:31:15 +0800 Subject: [PATCH] fix: not trim the text --- Cargo.toml | 4 ++-- derives/Cargo.toml | 2 +- derives/src/de.rs | 3 +-- tests/lib.rs | 10 +++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cfbe617..a13f404 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ["ImJeremyHe"] edition = "2018" name = "xmlserde" -version = "0.8.0" +version = "0.8.1" license = "MIT" description = "useful tool for serializing and deserializing xml" repository = "https://github.com/ImJeremyHe/xmlserde" @@ -13,4 +13,4 @@ readme = "README.md" quick-xml = {version = "0.31", features = ["serialize"]} [dev-dependencies] -xmlserde_derives = {path = "./derives", version = "0.8.0"} +xmlserde_derives = {path = "./derives", version = "0.8.1"} diff --git a/derives/Cargo.toml b/derives/Cargo.toml index 1f233e5..56e0d6c 100644 --- a/derives/Cargo.toml +++ b/derives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xmlserde_derives" -version = "0.8.0" +version = "0.8.1" description = "macros that help xmlserde serde the xml files" authors = ["ImJeremyHe"] license = "MIT" diff --git a/derives/src/de.rs b/derives/src/de.rs index ab15ef4..308217c 100644 --- a/derives/src/de.rs +++ b/derives/src/de.rs @@ -596,8 +596,7 @@ fn children_match_branch( Ok(Event::Text(t)) => { use ::xmlserde::{XmlValue, XmlDeserialize}; let _str = t.unescape().expect("failed to unescape string"); - let _str = _str.trim(); - if _str != "" { + if _str.trim() != "" { #untag_text_enum } } diff --git a/tests/lib.rs b/tests/lib.rs index 822eb8b..0d5ce05 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -120,7 +120,7 @@ mod tests { pub cnt: u32, } let xml = r#" - Tom + Tom Jerry "#; let result = xml_deserialize_from_str::(xml); @@ -131,7 +131,7 @@ mod tests { let mut child_iter = result.f.into_iter(); let first = child_iter.next().unwrap(); assert_eq!(first.age, 15); - assert_eq!(first.name, String::from("Tom")); + assert_eq!(first.name, String::from(" Tom")); let second = child_iter.next().unwrap(); assert_eq!(second.age, 9); assert_eq!(second.name, String::from("Jerry")); @@ -654,14 +654,14 @@ mod tests { } let xml = r#" - text1 + text1 text2 "#; let text_p = xml_deserialize_from_str::(&xml).unwrap(); let content = &text_p.text_p_content; assert_eq!(content.len(), 2); if let TextPContent::TextSpan(span) = content.get(0).unwrap() { - assert_eq!(&span.t, "text1") + assert_eq!(&span.t, " text1 ") } else { panic!("") } @@ -674,7 +674,7 @@ mod tests { let expect = xml_serialize(text_p); assert_eq!( expect, - "text1text2" + " text1 text2" ); let xml = r#"abcdefg"#;