proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-07 09:51:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

formatting cleanup

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-07-19 14:30:48 +02:00
parent 061cc5b525
commit ce5fa31721
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxmox-api-macro/src/api_def.rs
View File

@ -142,10 +142,9 @@ impl ParameterDefinition {
syn::Lit::Str(description) => Ok(ParameterDefinition::builder() syn::Lit::Str(description) => Ok(ParameterDefinition::builder()
.description(Some(description)) .description(Some(description))
.build() .build()
.map_err(|e| c_format_err!(span, "{}", e))? .map_err(|e| c_format_err!(span, "{}", e))?),
),
_ => c_bail!(span, "expected description or field definition"), _ => c_bail!(span, "expected description or field definition"),
} },
Expression::Object(obj) => ParameterDefinition::from_object(obj), Expression::Object(obj) => ParameterDefinition::from_object(obj),
_ => c_bail!(span, "expected description or field definition"), _ => c_bail!(span, "expected description or field definition"),
} }

14
proxmox-api-macro/src/api_macro.rs
View File

@ -483,7 +483,8 @@ fn handle_struct_named(
item: &syn::FieldsNamed, item: &syn::FieldsNamed,
) -> Result<TokenStream, Error> { ) -> Result<TokenStream, Error> {
let common = CommonTypeDefinition::from_object(&mut definition)?; let common = CommonTypeDefinition::from_object(&mut definition)?;
let mut field_def = definition.remove("fields") let mut field_def = definition
.remove("fields")
.ok_or_else(|| c_format_err!(definition.span(), "missing 'fields' entry"))? .ok_or_else(|| c_format_err!(definition.span(), "missing 'fields' entry"))?
.expect_object()?; .expect_object()?;
@ -510,16 +511,15 @@ fn handle_struct_named(
for field in item.named.iter() { for field in item.named.iter() {
mem_id += 1; mem_id += 1;
let field_ident = field.ident let field_ident = field
.ident
.as_ref() .as_ref()
.ok_or_else(|| c_format_err!(field => "missing field name"))?; .ok_or_else(|| c_format_err!(field => "missing field name"))?;
let field_s = field_ident.to_string(); let field_s = field_ident.to_string();
let def = field_def let def = field_def.remove(&field_s).ok_or_else(
.remove(&field_s) || c_format_err!(field => "missing api description entry for field {}", field_s),
.ok_or_else(|| { )?;
c_format_err!(field => "missing api description entry for field {}", field_s)
})?;
let def = ParameterDefinition::from_expression(def)?; let def = ParameterDefinition::from_expression(def)?;
let field_span = field_ident.span(); let field_span = field_ident.span();

2
proxmox-api-macro/src/util.rs
View File

@ -1,8 +1,8 @@
use proc_macro2::Ident; use proc_macro2::Ident;
use syn::{parenthesized, Token};
use syn::parse::{Parse, ParseStream}; use syn::parse::{Parse, ParseStream};
use syn::punctuated::Punctuated; use syn::punctuated::Punctuated;
use syn::{parenthesized, Token};
macro_rules! c_format_err { macro_rules! c_format_err {
($span:expr => $($msg:tt)*) => { syn::Error::new_spanned($span, format!($($msg)*)) }; ($span:expr => $($msg:tt)*) => { syn::Error::new_spanned($span, format!($($msg)*)) };