From 13f7516a4d88f15763b7186cc3a95ccb3cfbd5c0 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 19 Aug 2021 08:21:18 +0200 Subject: [PATCH] Fixed some lints from Rust Analyzer with experimental proc-macros --- macros/src/codegen/dispatchers.rs | 3 +++ macros/src/codegen/local_resources.rs | 2 ++ macros/src/codegen/module.rs | 5 +++++ macros/src/codegen/shared_resources.rs | 1 + macros/src/codegen/software_tasks.rs | 6 ++++++ macros/src/codegen/timer_queue.rs | 5 +++++ 6 files changed, 22 insertions(+) diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs index c239b0f828..cfd8ee95a6 100644 --- a/macros/src/codegen/dispatchers.rs +++ b/macros/src/codegen/dispatchers.rs @@ -33,6 +33,7 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec Vec = rtic::RacyCell::new(#rq_expr); )); diff --git a/macros/src/codegen/local_resources.rs b/macros/src/codegen/local_resources.rs index a9ffa925b1..011d88671b 100644 --- a/macros/src/codegen/local_resources.rs +++ b/macros/src/codegen/local_resources.rs @@ -33,6 +33,7 @@ pub fn codegen( // For future use // let doc = format!(" RTIC internal: {}:{}", file!(), line!()); mod_app.push(quote!( + #[allow(non_camel_case_types)] #[allow(non_upper_case_globals)] // #[doc = #doc] #[doc(hidden)] @@ -58,6 +59,7 @@ pub fn codegen( // For future use // let doc = format!(" RTIC internal: {}:{}", file!(), line!()); mod_app.push(quote!( + #[allow(non_camel_case_types)] #[allow(non_upper_case_globals)] // #[doc = #doc] #[doc(hidden)] diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index d3afb27beb..cac89c7d76 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -131,6 +131,7 @@ pub fn codegen( items.push(quote!( /// Monotonics used by the system #[allow(non_snake_case)] + #[allow(non_camel_case_types)] pub struct #internal_monotonics_ident( #(pub #monotonic_types),* ); @@ -178,6 +179,8 @@ pub fn codegen( items.push(quote!( #(#cfgs)* /// Execution context + #[allow(non_snake_case)] + #[allow(non_camel_case_types)] pub struct #internal_context_name<#lt> { #(#fields,)* } @@ -318,6 +321,8 @@ pub fn codegen( items.push(quote!( #(#cfgs)* + #[allow(non_snake_case)] + #[allow(non_camel_case_types)] pub struct #internal_spawn_handle_ident { #[doc(hidden)] marker: u32, diff --git a/macros/src/codegen/shared_resources.rs b/macros/src/codegen/shared_resources.rs index 181832fd58..479ca93e9c 100644 --- a/macros/src/codegen/shared_resources.rs +++ b/macros/src/codegen/shared_resources.rs @@ -30,6 +30,7 @@ pub fn codegen( // For future use // let doc = format!(" RTIC internal: {}:{}", file!(), line!()); mod_app.push(quote!( + #[allow(non_camel_case_types)] #[allow(non_upper_case_globals)] // #[doc = #doc] #[doc(hidden)] diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index 0b07335946..17399b5031 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -49,6 +49,8 @@ pub fn codegen( mod_app.push(quote!( // /// Queue version of a free-list that keeps track of empty slots in // /// the following buffers + #[allow(non_camel_case_types)] + #[allow(non_upper_case_globals)] #[doc(hidden)] static #fq: rtic::RacyCell<#fq_ty> = rtic::RacyCell::new(#fq_expr); )); @@ -69,6 +71,8 @@ pub fn codegen( #uninit // /// Buffer that holds the instants associated to the inputs of a task // #[doc = #doc] + #[allow(non_camel_case_types)] + #[allow(non_upper_case_globals)] #[doc(hidden)] static #instants: rtic::RacyCell<[core::mem::MaybeUninit>; #cap_lit]> = @@ -82,6 +86,8 @@ pub fn codegen( mod_app.push(quote!( #uninit // /// Buffer that holds the inputs of a task + #[allow(non_camel_case_types)] + #[allow(non_upper_case_globals)] #[doc(hidden)] static #inputs_ident: rtic::RacyCell<[core::mem::MaybeUninit<#input_ty>; #cap_lit]> = rtic::RacyCell::new([#(#elems,)*]); diff --git a/macros/src/codegen/timer_queue.rs b/macros/src/codegen/timer_queue.rs index bf896ee654..e805292a7f 100644 --- a/macros/src/codegen/timer_queue.rs +++ b/macros/src/codegen/timer_queue.rs @@ -15,6 +15,7 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec = rtic::RacyCell::new(0); )); @@ -74,6 +75,8 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec = rtic::RacyCell::new(rtic::export::TimerQueue(rtic::export::SortedLinkedList::new_u16())); )); @@ -85,6 +88,8 @@ pub fn codegen(app: &App, analysis: &Analysis, _extra: &Extra) -> Vec> = rtic::RacyCell::new(None); )); }