diff options
Diffstat (limited to 'cortex-m-rt/macros')
| -rw-r--r-- | cortex-m-rt/macros/src/lib.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs index 817e9a1..24f3fa1 100644 --- a/cortex-m-rt/macros/src/lib.rs +++ b/cortex-m-rt/macros/src/lib.rs @@ -28,10 +28,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream { && f.sig.variadic.is_none() && match f.sig.output { ReturnType::Default => false, - ReturnType::Type(_, ref ty) => match **ty { - Type::Never(_) => true, - _ => false, - }, + ReturnType::Type(_, ref ty) => matches!(**ty, Type::Never(_)), }; if !valid_signature { @@ -159,7 +156,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream { Exception::DefaultHandler | Exception::HardFault | Exception::NonMaskableInt => { // These are unsafe to define. let name = if exn == Exception::DefaultHandler { - format!("`DefaultHandler`") + "`DefaultHandler`".to_string() } else { format!("`{:?}` handler", exn) }; @@ -252,10 +249,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream { && f.sig.variadic.is_none() && match f.sig.output { ReturnType::Default => false, - ReturnType::Type(_, ref ty) => match **ty { - Type::Never(_) => true, - _ => false, - }, + ReturnType::Type(_, ref ty) => matches!(**ty, Type::Never(_)), }; if !valid_signature { @@ -557,7 +551,7 @@ fn extract_static_muts( let mut seen = HashSet::new(); let mut statics = vec![]; let mut stmts = vec![]; - while let Some(stmt) = istmts.next() { + for stmt in istmts.by_ref() { match stmt { Stmt::Item(Item::Static(var)) => { if var.mutability.is_some() { @@ -622,7 +616,7 @@ fn check_attr_whitelist(attrs: &[Attribute], caller: WhiteListCaller) -> Result< 'o: for attr in attrs { for val in whitelist { - if eq(&attr, &val) { + if eq(attr, val) { continue 'o; } } |