Automatically set MSRV for code under #[cfg(version)]
#14940
+206
−58
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @samueltardieu. Use |
rustbot
added
the
S-waiting-on-review
samueltardieu
approved these changes
May 31, 2025
There was a problem hiding this comment.
This LGTM with the nit and the extra test. I'll let @flip1995 do the final check since he wants to be involved the the book is modified.
clippy_utils/src/msrvs.rs
Outdated
| return Some(version); | ||
| let mut first_clippy_attr = None; | ||
| let mut clippy_msrv = None; | ||
| let mut cfg_version: Option<RustcVersion> = None; |
There was a problem hiding this comment.
Nit, this looks strange to have only one ascribed variable.
Suggested change
| let mut cfg_version: Option<RustcVersion> = None; | |
| let mut cfg_version = None; |
tests/ui/cfg_version_msrv.rs
Outdated
Comment on lines
27
to
40
| #[clippy::msrv = "1.40"] | ||
| #[cfg(version("1.80"))] | ||
| fn both_attributes(i: i32) { | ||
| // if both are specified on the same node then `clippy::msrv` takes precedence | ||
| let _ = i.isqrt(); | ||
| //~^ ERROR: is `1.40.0` | ||
| } |
There was a problem hiding this comment.
As a non-regression test, could you duplicate this test and reverse both versions (because here clippy::msrv is also the smaller one)?
|
r? @flip1995 |
|
Thanks. |
|
Sorry, I forgot I wanted to let @flip1995 weight in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #14827
Semantics:
#[clippy::msrv]and#[cfg(version)]applying to the same node#[clippy::msrv]winsnot()version bounds are ignored (if double/quad/etc negated it will be applied once more)all/anythe lowest found version is usedWhen the feature is stable we can go back and improve the docs a bit more with a better example
changelog: code using
#[cfg(version)]will have the MSRV automatically detected