Skip to content

Commit 066bdb2

Browse files
committed
replace with ?
1 parent aeaa348 commit 066bdb2

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

clippy_utils/src/msrvs.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,24 +189,24 @@ impl MsrvStack {
189189
fn parse_attrs(sess: &Session, attrs: &[impl AttributeExt]) -> Option<RustcVersion> {
190190
let mut msrv_attrs = attrs.iter().filter(|attr| attr.path_matches(&[sym::clippy, sym::msrv]));
191191

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-
}
192+
let msrv_attr = msrv_attrs.next()?;
199193

200-
if let Some(msrv) = msrv_attr.value_str() {
201-
if let Some(version) = parse_version(msrv) {
202-
return Some(version);
203-
}
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();
199+
}
204200

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");
201+
if let Some(msrv) = msrv_attr.value_str() {
202+
if let Some(version) = parse_version(msrv) {
203+
return Some(version);
209204
}
205+
206+
sess.dcx()
207+
.span_err(msrv_attr.span(), format!("`{msrv}` is not a valid Rust version"));
208+
} else {
209+
sess.dcx().span_err(msrv_attr.span(), "bad clippy attribute");
210210
}
211211

212212
None

0 commit comments

Comments
 (0)