OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-01-08 04:21:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix enum type not being wrapped as Vec if repeated

Browse Source
This commit is contained in:
OMGeeky
2024-05-17 23:41:00 +02:00
parent e7fd8e36b7
commit a1e9e4ba94
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generator/lib/util.py
View File

@@ -461,10 +461,11 @@ def to_rust_type_inner(
return wrap_type(rt)
try:
if is_property_enum(t):
x = get_enum_type(schema_name, property_name)
return wrap_type(x)
# prefer format if present
rust_type = RUST_TYPE_MAP[t.get("format", t["type"])]
rust_type = get_enum_type(schema_name, property_name)
else:
# prefer format if present
rust_type = RUST_TYPE_MAP[t.get("format", t["type"])]
if rust_type == Vec(None):
return wrap_type(Vec(nested_type(t)))
if rust_type == HashMap(None, None):

4
src/generator/templates/api/lib/enum.mako
View File

@@ -95,7 +95,7 @@ if not enum_descriptions:
<% #print(variant_name, '=>', description)
%>
% if description:
% for line in e.description.splitlines():
% for line in description.splitlines():
/// ${line}
% endfor
///
@@ -138,7 +138,7 @@ impl<'a> Into<std::borrow::Cow<'a, str>> for &'a ${enum_type} {
% if get_enum_default(e) is not None:
impl Default for ${enum_type} {
fn default() -> ${enum_type} {
${enum_type}::${to_enum_variant_name(e.get('default'))}
${enum_type}::${to_enum_variant_name(e.default)}
}
}
% endif

6
src/generator/templates/api/lib/mbuild.mako
View File

@@ -581,7 +581,7 @@ match result {
% endif ## not is_required_property(p)
% endif is_repeated_property(p):
% endif ## p.name == 'part' and request_value:
% if p.get('repeated', False):
% if is_repeated_property(p):
if ${pname}.len() > 0 {
for f in ${pname}.iter() {
params.push("${p.name}", ${to_string_impl("f")});
@@ -592,8 +592,10 @@ match result {
params.push("${p.name}", ${to_string_impl("value")});
}
% else:
params.push("${p.name}", &${to_string_impl(pname)});
let param = ${to_string_impl(pname)};
params.push("${p.name}", &param);
% endif
% endfor
params.extend(${paddfields}.iter());