File tree Expand file tree Collapse file tree 1 file changed +18
-18
lines changed Expand file tree Collapse file tree 1 file changed +18
-18
lines changed Original file line number Diff line number Diff line change @@ -189,25 +189,25 @@ impl MsrvStack {
189
189
fn parse_attrs ( sess : & Session , attrs : & [ impl AttributeExt ] ) -> Option < RustcVersion > {
190
190
let mut msrv_attrs = attrs. iter ( ) . filter ( |attr| attr. path_matches ( & [ sym:: clippy, sym:: msrv] ) ) ;
191
191
192
- if let Some ( msrv_attr) = msrv_attrs. next ( ) {
193
- if let Some ( duplicate) = msrv_attrs. next_back ( ) {
194
- sess. dcx ( )
195
- . struct_span_err ( duplicate. span ( ) , "`clippy::msrv` is defined multiple times" )
196
- . with_span_note ( msrv_attr. span ( ) , "first definition found here" )
197
- . emit ( ) ;
198
- }
199
-
200
- if let Some ( msrv) = msrv_attr. value_str ( ) {
201
- if let Some ( version) = parse_version ( msrv) {
202
- return Some ( version) ;
203
- }
192
+ let msrv_attr = msrv_attrs. next ( ) ?;
204
193
205
- sess . dcx ( )
206
- . span_err ( msrv_attr . span ( ) , format ! ( "`{msrv}` is not a valid Rust version" ) ) ;
207
- } else {
208
- sess . dcx ( ) . span_err ( msrv_attr. span ( ) , "bad clippy attribute" ) ;
209
- }
194
+ if let Some ( duplicate ) = msrv_attrs . next_back ( ) {
195
+ sess . dcx ( )
196
+ . struct_span_err ( duplicate . span ( ) , "`clippy::msrv` is defined multiple times" )
197
+ . with_span_note ( msrv_attr. span ( ) , "first definition found here" )
198
+ . emit ( ) ;
210
199
}
211
200
212
- None
201
+ let Some ( msrv) = msrv_attr. value_str ( ) else {
202
+ sess. dcx ( ) . span_err ( msrv_attr. span ( ) , "bad clippy attribute" ) ;
203
+ return None ;
204
+ } ;
205
+
206
+ let Some ( version) = parse_version ( msrv) else {
207
+ sess. dcx ( )
208
+ . span_err ( msrv_attr. span ( ) , format ! ( "`{msrv}` is not a valid Rust version" ) ) ;
209
+ return None ;
210
+ } ;
211
+
212
+ Some ( version)
213
213
}
You can’t perform that action at this time.
0 commit comments