Skip to content

Commit 5495f12

Browse files
committed
Fix option type path
1 parent 3cfb3c2 commit 5495f12

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

xml_schema_derive/src/xsd/element.rs

+14-12
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,6 @@ impl Element {
147147
rust_type
148148
};
149149

150-
let rust_type = if optional || (!multiple && self.min_occurences == Some(0)) {
151-
quote!(Option<#rust_type>)
152-
} else {
153-
rust_type
154-
};
155-
156-
let prefix_attribute = prefix
157-
.as_ref()
158-
.map(|prefix| quote!(, prefix=#prefix))
159-
.unwrap_or_default();
160-
161150
let module = (!context.is_in_sub_module()
162151
&& !self
163152
.kind
@@ -170,9 +159,22 @@ impl Element {
170159
.then_some(quote!(xml_schema_types::))
171160
.unwrap_or_default();
172161

162+
let rust_type = quote!(#module#rust_type);
163+
164+
let rust_type = if optional || (!multiple && self.min_occurences == Some(0)) {
165+
quote!(Option<#rust_type>)
166+
} else {
167+
rust_type
168+
};
169+
170+
let prefix_attribute = prefix
171+
.as_ref()
172+
.map(|prefix| quote!(, prefix=#prefix))
173+
.unwrap_or_default();
174+
173175
quote! {
174176
#[yaserde(rename=#yaserde_rename #prefix_attribute)]
175-
pub #attribute_name: #module#rust_type,
177+
pub #attribute_name: #rust_type,
176178
}
177179
}
178180
}

0 commit comments

Comments
 (0)