nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 15:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

xml: Comprehensive refactoring from byte strings to strings

Browse Source
This commit is contained in:
Lennart
2025-08-28 18:01:41 +02:00
parent 85787e69bc
commit c4604d4376
37 changed files with 158 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/xml/tests/de_enum.rs
View File

@@ -1,9 +1,9 @@
use rustical_xml::{de::XmlDocument, XmlDeserialize, XmlRootTag};
use rustical_xml::{XmlDeserialize, XmlRootTag, de::XmlDocument};
#[test]
fn test_struct_tagged_enum() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"propfind")]
#[xml(root = "propfind")]
struct Propfind {
prop: Prop,
}
@@ -58,7 +58,7 @@ fn test_struct_tagged_enum() {
#[test]
fn test_tagged_enum_complex() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"propfind")]
#[xml(root = "propfind")]
struct Propfind {
prop: PropStruct,
}
@@ -116,7 +116,7 @@ fn test_enum_document() {
#[test]
fn test_untagged_enum() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
prop: PropElement,
}

36
crates/xml/tests/de_struct.rs
View File

@@ -6,7 +6,7 @@ use std::collections::HashSet;
#[test]
fn test_struct_text_field() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "text")]
text: String,
@@ -27,7 +27,7 @@ fn test_struct_text_field() {
#[test]
fn test_struct_document() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Child,
}
@@ -52,9 +52,9 @@ fn test_struct_document() {
#[test]
fn test_struct_rename_field() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(rename = b"ok-wow")]
#[xml(rename = "ok-wow")]
child: Child,
}
@@ -78,7 +78,7 @@ fn test_struct_rename_field() {
#[test]
fn test_struct_optional_field() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Option<Child>,
}
@@ -96,9 +96,9 @@ fn test_struct_optional_field() {
#[test]
fn test_struct_vec() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(rename = b"child", flatten)]
#[xml(rename = "child", flatten)]
children: Vec<Child>,
}
@@ -124,9 +124,9 @@ fn test_struct_vec() {
#[test]
fn test_struct_set() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(rename = b"child", flatten)]
#[xml(rename = "child", flatten)]
children: HashSet<Child>,
}
@@ -154,7 +154,7 @@ fn test_struct_ns() {
const NS_HELLO: Namespace = Namespace(b"hello");
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ns = "NS_HELLO")]
child: (),
@@ -169,7 +169,7 @@ fn test_struct_attr() {
const NS_HELLO: Namespace = Namespace(b"hello");
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ns = "NS_HELLO")]
child: (),
@@ -196,7 +196,7 @@ fn test_struct_attr() {
#[test]
fn test_struct_generics() {
#[derive(XmlDeserialize, XmlRootTag)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document<T: XmlDeserialize> {
#[allow(dead_code)]
child: T,
@@ -217,7 +217,7 @@ fn test_struct_generics() {
#[test]
fn test_struct_unparsed() {
#[derive(XmlDeserialize, XmlRootTag)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[allow(dead_code)]
child: Unparsed,
@@ -238,7 +238,7 @@ fn test_struct_unparsed() {
#[test]
fn test_xml_values() {
#[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
href: String,
}
@@ -262,7 +262,7 @@ fn test_xml_values() {
#[test]
fn test_xml_cdata() {
#[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "text")]
hello: String,
@@ -293,7 +293,7 @@ fn test_xml_cdata() {
#[test]
fn test_struct_xml_decl() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Child,
}
@@ -323,7 +323,7 @@ fn test_struct_xml_decl() {
#[test]
fn test_struct_tuple() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Child,
}
@@ -348,7 +348,7 @@ fn test_struct_tuple() {
#[test]
fn test_struct_untagged_ns() {
#[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "untagged")]
child: Child,

2
crates/xml/tests/enum_variants.rs
View File

@@ -29,7 +29,7 @@ enum CalendarProp {
#[allow(dead_code)]
Getcontenttype(&'static str),
#[xml(ns = "NS_DAV", rename = b"principal-URL")]
#[xml(ns = "NS_DAV", rename = "principal-URL")]
#[allow(dead_code)]
PrincipalUrl,
#[allow(dead_code)]

2
crates/xml/tests/propertyupdate.rs
View File

@@ -36,7 +36,7 @@ fn test_propertyupdate() {
}
#[derive(XmlDeserialize, XmlRootTag)]
#[xml(root = b"propertyupdate")]
#[xml(root = "propertyupdate")]
struct PropertyupdateElement<T: XmlDeserialize> {
#[xml(ty = "untagged", flatten)]
#[allow(dead_code)]

2
crates/xml/tests/se_enum.rs
View File

@@ -3,7 +3,7 @@ use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
#[test]
fn test_struct_value_tagged() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"propfind")]
#[xml(root = "propfind")]
struct Document {
prop: Prop,
}

28
crates/xml/tests/se_struct.rs
View File

@@ -7,7 +7,7 @@ use xml_derive::XmlDeserialize;
#[test]
fn test_struct_document() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Child,
}
@@ -30,7 +30,7 @@ fn test_struct_document() {
#[test]
fn test_struct_untagged_attr() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "attr")]
name: String,
@@ -57,7 +57,7 @@ fn test_struct_untagged_attr() {
#[test]
fn test_struct_value_tagged() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
href: String,
num: usize,
@@ -82,7 +82,7 @@ fn test_struct_value_tagged() {
#[test]
fn test_struct_value_untagged() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "untagged")]
href: String,
@@ -103,7 +103,7 @@ fn test_struct_value_untagged() {
#[test]
fn test_struct_vec() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(flatten)]
href: Vec<String>,
@@ -127,7 +127,7 @@ fn test_struct_vec() {
#[test]
fn test_struct_serialize_with() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(serialize_with = "serialize_href")]
href: String,
@@ -136,8 +136,8 @@ fn test_struct_serialize_with() {
fn serialize_href(
val: &str,
ns: Option<Namespace>,
tag: Option<&[u8]>,
namespaces: &HashMap<Namespace, &[u8]>,
tag: Option<&str>,
namespaces: &HashMap<Namespace, &str>,
writer: &mut Writer<&mut Vec<u8>>,
) -> std::io::Result<()> {
val.to_uppercase().serialize(ns, tag, namespaces, writer)
@@ -160,7 +160,7 @@ fn test_struct_serialize_with() {
#[test]
fn test_struct_tag_list() {
#[derive(Debug, XmlRootTag, XmlSerialize, XmlDeserialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ty = "untagged", flatten)]
tags: Vec<Tag>,
@@ -194,9 +194,9 @@ fn test_struct_ns() {
const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
#[derive(Debug, XmlRootTag, XmlSerialize)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
#[xml(ns = "NS", rename = b"okay")]
#[xml(ns = "NS", rename = "okay")]
child: String,
}
@@ -210,7 +210,7 @@ fn test_struct_ns() {
#[test]
fn test_struct_tuple() {
#[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
#[xml(root = b"document")]
#[xml(root = "document")]
struct Document {
child: Child,
}
@@ -230,8 +230,8 @@ fn test_tuple_struct() {
const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
#[derive(Debug, XmlRootTag, XmlSerialize)]
#[xml(root = b"document")]
struct Document(#[xml(ns = "NS", rename = b"okay")] String);
#[xml(root = "document")]
struct Document(#[xml(ns = "NS", rename = "okay")] String);
Document("hello!".to_string())
.serialize_to_string()