diff options
| author | Ada Alakbarova <ada.alakbarova@proton.me> | 2025-08-14 23:14:12 +0200 |
|---|---|---|
| committer | Ada Alakbarova <ada.alakbarova@proton.me> | 2025-08-14 23:14:12 +0200 |
| commit | 066bdb2155b21a9e36e0f59b64ac3df91b6b10b4 (patch) | |
| tree | 8bdf65bde403dcd6d548accc5888fbd5de91eea4 | |
| parent | aeaa348b42e72a80ad27b39610b7fc58113bb3b8 (diff) | |
| download | rust-066bdb2155b21a9e36e0f59b64ac3df91b6b10b4.tar.gz rust-066bdb2155b21a9e36e0f59b64ac3df91b6b10b4.zip | |
replace with `?`
| -rw-r--r-- | clippy_utils/src/msrvs.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/clippy_utils/src/msrvs.rs b/clippy_utils/src/msrvs.rs index 89a83e2c48f..3c96b15a99d 100644 --- a/clippy_utils/src/msrvs.rs +++ b/clippy_utils/src/msrvs.rs @@ -189,24 +189,24 @@ impl MsrvStack { fn parse_attrs(sess: &Session, attrs: &[impl AttributeExt]) -> Option<RustcVersion> { let mut msrv_attrs = attrs.iter().filter(|attr| attr.path_matches(&[sym::clippy, sym::msrv])); - if let Some(msrv_attr) = msrv_attrs.next() { - if let Some(duplicate) = msrv_attrs.next_back() { - sess.dcx() - .struct_span_err(duplicate.span(), "`clippy::msrv` is defined multiple times") - .with_span_note(msrv_attr.span(), "first definition found here") - .emit(); - } + let msrv_attr = msrv_attrs.next()?; - if let Some(msrv) = msrv_attr.value_str() { - if let Some(version) = parse_version(msrv) { - return Some(version); - } + if let Some(duplicate) = msrv_attrs.next_back() { + sess.dcx() + .struct_span_err(duplicate.span(), "`clippy::msrv` is defined multiple times") + .with_span_note(msrv_attr.span(), "first definition found here") + .emit(); + } - sess.dcx() - .span_err(msrv_attr.span(), format!("`{msrv}` is not a valid Rust version")); - } else { - sess.dcx().span_err(msrv_attr.span(), "bad clippy attribute"); + if let Some(msrv) = msrv_attr.value_str() { + if let Some(version) = parse_version(msrv) { + return Some(version); } + + sess.dcx() + .span_err(msrv_attr.span(), format!("`{msrv}` is not a valid Rust version")); + } else { + sess.dcx().span_err(msrv_attr.span(), "bad clippy attribute"); } None |
