Add clippy into the known cfg list
#121137
Merged
Conversation
This file contains 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
added
S-waiting-on-review
flip1995
reviewed
Feb 15, 2024
Urgau
reviewed
Feb 15, 2024
| @@ -1441,6 +1441,7 @@ impl CheckCfg { | |||
| // These three are never set by rustc, but we set them anyway: they | |||
| // should not trigger a lint because `cargo doc`, `cargo test`, and | |||
| // `cargo miri run` (respectively) can set them. | |||
| ins!(sym::clippy, no_values); | |||
There was a problem hiding this comment.
It needs to be added in tests/ui/check-cfg/well-known-values.rs.
You will also probably need to bless the directory
This comment has been minimized.
This comment has been minimized.
Urgau
reviewed
Feb 15, 2024
| @@ -1441,6 +1441,7 @@ impl CheckCfg { | |||
| // These three are never set by rustc, but we set them anyway: they | |||
| // should not trigger a lint because `cargo doc`, `cargo test`, and | |||
| // `cargo miri run` (respectively) can set them. | |||
| ins!(sym::clippy, no_values); | |||
There was a problem hiding this comment.
The check-cfg section of the unstable book also needs updating:
rust/src/doc/unstable-book/src/compiler-flags/check-cfg.md
Lines 80 to 87 in 4ae1e79
There was a problem hiding this comment.
The code here should have a comment mentioning the docs :)
GuillaumeGomez
force-pushed
the
add-clippy-cfg
branch
from
150cef9 to
2bffcbf
Compare
Urgau
reviewed
Feb 15, 2024
| @@ -81,6 +81,7 @@ As of `2024-01-09T`, the list of known names is as follows: | |||
|
|
|||
| <!--- See CheckCfg::fill_well_known in compiler/rustc_session/src/config.rs --> | |||
|
|
|||
| - `clippy` | |||
There was a problem hiding this comment.
Would be great if you could also update the date above to 2024-02-15T
| @@ -106,4 +106,7 @@ fn unix() {} | |||
| #[cfg(doc)] | |||
| fn doc() {} | |||
|
|
|||
| #[cfg(clippy)] | |||
| fn clippy() {} | |||
There was a problem hiding this comment.
Could you also add the cfg above as to check that we only expect clippy and nothing else.
#[cfg(any(
// tidy-alphabetical-start
+ clippy = "_UNEXPECTED_VALUE",
+ //~^ WARN unexpected `cfg` condition value
debug_assertions = "_UNEXPECTED_VALUE",
//~^ WARN unexpected `cfg` condition value
GuillaumeGomez
force-pushed
the
add-clippy-cfg
branch
from
2bffcbf to
a1c10e7
Compare
|
Updated! Thanks a lot for the reviews! |
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
add-clippy-cfg
branch
from
a1c10e7 to
870127e
Compare
Urgau
approved these changes
Feb 15, 2024
compiler/rustc_session/src/config.rs
Outdated
Comment on lines
1442
to
1443
| // should not trigger a lint because `cargo doc`, `cargo test`, | ||
| // `cargo clippy` and `cargo miri run` (respectively) can set them. |
There was a problem hiding this comment.
nit:
Suggested change
| // should not trigger a lint because `cargo doc`, `cargo test`, | |
| // `cargo clippy` and `cargo miri run` (respectively) can set them. | |
| // should not trigger a lint because `cargo clippy`, `cargo doc`, | |
| // `cargo test` and `cargo miri run` (respectively) can set them. |
There was a problem hiding this comment.
Ok, let's alpha sort them. 😆
GuillaumeGomez
force-pushed
the
add-clippy-cfg
branch
from
870127e to
4085421
Compare
…r if the check-cfg list is updated
|
Guillaume asked me to review the PR since I commented on it, and it looks good to me. |
bors
added
S-waiting-on-bors
|
@bors rollup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 16, 2024
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#119928 (suggest `into_iter()` when `Iterator` method called on `impl IntoIterator`) - rust-lang#121020 (Avoid an ICE in diagnostics) - rust-lang#121111 (For E0038, suggest associated type if available) - rust-lang#121137 (Add clippy into the known `cfg` list) - rust-lang#121179 (allow mutable references in const values when they point to no memory) - rust-lang#121181 (Fix an ICE in the recursion lint) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 16, 2024
Rollup merge of rust-lang#121137 - GuillaumeGomez:add-clippy-cfg, r=Urgau,Nilstrieb Add clippy into the known `cfg` list In clippy, we are removing the `feature = "cargo-clippy"` cfg to replace it with `clippy` in rust-lang/rust-clippy#12292. But for it to work, we need to declare `clippy` as cfg. It makes it more coherent with other existing tools like rustdoc. cc `@flip1995`
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.
In clippy, we are removing the
feature = "cargo-clippy"cfg to replace it withclippyin rust-lang/rust-clippy#12292. But for it to work, we need to declareclippyas cfg. It makes it more coherent with other existing tools like rustdoc.cc @flip1995