Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

rustfmt

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-08-13 13:31:57 +02:00
parent 744d69c2ab
commit 917ce00dd6
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxmox-api-macro/src/api/mod.rs
View File

@ -147,9 +147,9 @@ impl Schema {
/// Create the token stream for a reference schema (`ExternType` or `ExternSchema`). /// Create the token stream for a reference schema (`ExternType` or `ExternSchema`).
fn to_schema_reference(&self) -> Option<TokenStream> { fn to_schema_reference(&self) -> Option<TokenStream> {
match &self.item { match &self.item {
SchemaItem::ExternType(path) => { SchemaItem::ExternType(path) => Some(
Some(quote_spanned! { path.span() => &<#path as ::proxmox::api::schema::ApiType>::API_SCHEMA }) quote_spanned! { path.span() => &<#path as ::proxmox::api::schema::ApiType>::API_SCHEMA },
} ),
SchemaItem::ExternSchema(path) => Some(quote_spanned! { path.span() => &#path }), SchemaItem::ExternSchema(path) => Some(quote_spanned! { path.span() => &#path }),
_ => None, _ => None,
} }

6
proxmox-api-macro/src/lib.rs
View File

@ -302,7 +302,11 @@ pub fn derive_updater(_item: TokenStream_1) -> TokenStream_1 {
pub fn derive_updater_type(item: TokenStream_1) -> TokenStream_1 { pub fn derive_updater_type(item: TokenStream_1) -> TokenStream_1 {
let _error_guard = init_local_error(); let _error_guard = init_local_error();
let item: TokenStream = item.into(); let item: TokenStream = item.into();
handle_error(item.clone(), updater::updater_type(item).map_err(Error::from)).into() handle_error(
item.clone(),
updater::updater_type(item).map_err(Error::from),
)
.into()
} }
thread_local!(static NON_FATAL_ERRORS: RefCell<Option<TokenStream>> = RefCell::new(None)); thread_local!(static NON_FATAL_ERRORS: RefCell<Option<TokenStream>> = RefCell::new(None));

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

@ -7,14 +7,10 @@ pub(crate) fn updater_type(item: TokenStream) -> Result<TokenStream, syn::Error>
let full_span = item.span(); let full_span = item.span();
Ok(match item { Ok(match item {
syn::Item::Struct(syn::ItemStruct { syn::Item::Struct(syn::ItemStruct {
ident, ident, generics, ..
generics,
..
}) => derive_updater_type(full_span, ident, generics), }) => derive_updater_type(full_span, ident, generics),
syn::Item::Enum(syn::ItemEnum { syn::Item::Enum(syn::ItemEnum {
ident, ident, generics, ..
generics,
..
}) => derive_updater_type(full_span, ident, generics), }) => derive_updater_type(full_span, ident, generics),
_ => bail!(item => "`UpdaterType` cannot be derived for this type"), _ => bail!(item => "`UpdaterType` cannot be derived for this type"),
}) })
@ -28,11 +24,7 @@ fn no_generics(generics: syn::Generics) {
} }
} }
fn derive_updater_type( fn derive_updater_type(full_span: Span, ident: Ident, generics: syn::Generics) -> TokenStream {
full_span: Span,
ident: Ident,
generics: syn::Generics,
) -> TokenStream {
no_generics(generics); no_generics(generics);
quote_spanned! { full_span => quote_spanned! { full_span =>