@@ -28,10 +28,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
28
28
&& f. sig . variadic . is_none ( )
29
29
&& match f. sig . output {
30
30
ReturnType :: Default => false ,
31
- ReturnType :: Type ( _, ref ty) => match * * ty {
32
- Type :: Never ( _) => true ,
33
- _ => false ,
34
- } ,
31
+ ReturnType :: Type ( _, ref ty) => matches ! ( * * ty, Type :: Never ( _) ) ,
35
32
} ;
36
33
37
34
if !valid_signature {
@@ -159,7 +156,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream {
159
156
Exception :: DefaultHandler | Exception :: HardFault | Exception :: NonMaskableInt => {
160
157
// These are unsafe to define.
161
158
let name = if exn == Exception :: DefaultHandler {
162
- format ! ( "`DefaultHandler`" )
159
+ "`DefaultHandler`" . to_string ( )
163
160
} else {
164
161
format ! ( "`{:?}` handler" , exn)
165
162
} ;
@@ -252,10 +249,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream {
252
249
&& f. sig . variadic . is_none ( )
253
250
&& match f. sig . output {
254
251
ReturnType :: Default => false ,
255
- ReturnType :: Type ( _, ref ty) => match * * ty {
256
- Type :: Never ( _) => true ,
257
- _ => false ,
258
- } ,
252
+ ReturnType :: Type ( _, ref ty) => matches ! ( * * ty, Type :: Never ( _) ) ,
259
253
} ;
260
254
261
255
if !valid_signature {
@@ -557,7 +551,7 @@ fn extract_static_muts(
557
551
let mut seen = HashSet :: new ( ) ;
558
552
let mut statics = vec ! [ ] ;
559
553
let mut stmts = vec ! [ ] ;
560
- while let Some ( stmt) = istmts. next ( ) {
554
+ for stmt in istmts. by_ref ( ) {
561
555
match stmt {
562
556
Stmt :: Item ( Item :: Static ( var) ) => {
563
557
if var. mutability . is_some ( ) {
@@ -622,7 +616,7 @@ fn check_attr_whitelist(attrs: &[Attribute], caller: WhiteListCaller) -> Result<
622
616
623
617
' o: for attr in attrs {
624
618
for val in whitelist {
625
- if eq ( & attr, & val) {
619
+ if eq ( attr, val) {
626
620
continue ' o;
627
621
}
628
622
}
0 commit comments