proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-06 16:48:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api-macro: minor improvements

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-11-27 14:41:51 +01:00
parent 03012deb3f
commit 6e98ae0dd3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxmox-api-macro/src/api.rs
View File

@ -539,6 +539,9 @@ fn handle_function_signature(
fn is_api_method_type(ty: &syn::Type) -> bool { fn is_api_method_type(ty: &syn::Type) -> bool {
if let syn::Type::Reference(r) = ty { if let syn::Type::Reference(r) = ty {
if let syn::Type::Path(p) = &*r.elem { if let syn::Type::Path(p) = &*r.elem {
if p.qself.is_some() {
return false;
}
if let Some(ps) = p.path.segments.last() { if let Some(ps) = p.path.segments.last() {
return ps.ident == "ApiMethod"; return ps.ident == "ApiMethod";
} }
@ -563,6 +566,9 @@ fn is_rpc_env_type(ty: &syn::Type) -> bool {
/// Note that we cannot handle renamed imports at all here... /// Note that we cannot handle renamed imports at all here...
fn is_value_type(ty: &syn::Type) -> bool { fn is_value_type(ty: &syn::Type) -> bool {
if let syn::Type::Path(p) = ty { if let syn::Type::Path(p) = ty {
if p.qself.is_some() {
return false;
}
let segs = &p.path.segments; let segs = &p.path.segments;
match segs.len() { match segs.len() {
1 => return segs.last().unwrap().ident == "Value", 1 => return segs.last().unwrap().ident == "Value",
@ -636,6 +642,7 @@ fn create_wrapper_function(
api_method_param: &::proxmox::api::ApiMethod, api_method_param: &::proxmox::api::ApiMethod,
rpc_env_param: &mut dyn ::proxmox::api::RpcEnvironment, rpc_env_param: &mut dyn ::proxmox::api::RpcEnvironment,
) -> Result<::serde_json::Value, ::failure::Error> { ) -> Result<::serde_json::Value, ::failure::Error> {
#[allow(unused_variables)]
if let Value::Object(ref mut input_map) = &mut input_params { if let Value::Object(ref mut input_map) = &mut input_params {
#body #body
#func_name(#args) #func_name(#args)