Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix xmlname of root type #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nugine merged 1 commit into from
Jan 18, 2023
Merged

Fix xmlname of root type #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions crates/s3s-codegen/src/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ fn default_value_literal(v: &Value) -> &dyn fmt::Display {
}

fn codegen_xml_de(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {
let mut root_type_names: BTreeSet<&str> = default();
let mut root_type_names: BTreeMap<&str, Option<&str>> = default();
let mut field_type_names: BTreeSet<&str> = default();

let mut q: VecDeque<&str> = default();
Expand All @@ -350,7 +350,7 @@ fn codegen_xml_de(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {
let mut payload_count = 0;
for field in &ty.fields {
if is_xml_payload(field) {
root_type_names.insert(&field.type_);
root_type_names.insert(&field.type_, field.xml_name.as_deref());
field_type_names.insert(&field.type_);
q.push_back(&field.type_);
payload_count += 1;
Expand Down Expand Up @@ -510,13 +510,13 @@ fn codegen_xml_de(ops: &Operations, rust_types: &RustTypes, g: &mut Codegen) {
g.lf();
}

for rust_type in root_type_names.iter().map(|&name| &rust_types[name]) {
for (rust_type, xml_name) in root_type_names.iter().map(|(&name, xml_name)| (&rust_types[name], xml_name)) {
let rust::Type::Struct(ty) = rust_type else { panic!("{rust_type:#?}") };

g.ln(f!("impl<'xml> xml::Deserialize<'xml> for {} {{", ty.name));
g.ln("fn deserialize(d: &mut xml::Deserializer<'xml>) -> xml::DeResult<Self> {");

let xml_name = ty.xml_name.as_ref().unwrap_or(&ty.name);
let xml_name = xml_name.or(ty.xml_name.as_deref()).unwrap_or(&ty.name);
g.ln(f!("d.named_element(\"{xml_name}\", |d|d.content())"));

g.ln("}");
Expand Down
8 changes: 4 additions & 4 deletions crates/s3s/src/ops/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11471,7 +11471,7 @@ impl<'xml> xml::Deserialize<'xml> for AnalyticsConfiguration {

impl<'xml> xml::Deserialize<'xml> for BucketLifecycleConfiguration {
fn deserialize(d: &mut xml::Deserializer<'xml>) -> xml::DeResult<Self> {
d.named_element("BucketLifecycleConfiguration", |d| d.content())
d.named_element("LifecycleConfiguration", |d| d.content())
}
}

Expand All @@ -11489,7 +11489,7 @@ impl<'xml> xml::Deserialize<'xml> for CORSConfiguration {

impl<'xml> xml::Deserialize<'xml> for CompletedMultipartUpload {
fn deserialize(d: &mut xml::Deserializer<'xml>) -> xml::DeResult<Self> {
d.named_element("CompletedMultipartUpload", |d| d.content())
d.named_element("CompleteMultipartUpload", |d| d.content())
}
}

Expand Down Expand Up @@ -11537,13 +11537,13 @@ impl<'xml> xml::Deserialize<'xml> for ObjectLockConfiguration {

impl<'xml> xml::Deserialize<'xml> for ObjectLockLegalHold {
fn deserialize(d: &mut xml::Deserializer<'xml>) -> xml::DeResult<Self> {
d.named_element("ObjectLockLegalHold", |d| d.content())
d.named_element("LegalHold", |d| d.content())
}
}

impl<'xml> xml::Deserialize<'xml> for ObjectLockRetention {
fn deserialize(d: &mut xml::Deserializer<'xml>) -> xml::DeResult<Self> {
d.named_element("ObjectLockRetention", |d| d.content())
d.named_element("Retention", |d| d.content())
}
}

Expand Down