Improve `--check-cfg` implementation #94175

Urgau · 2022-02-20T00:40:29Z

This pull-request is a mix of improvements regarding the --check-cfg implementation:

Simpler internal representation (usage of Option instead of separate bool)
Add --check-cfg to the unstable book (based on the RFC)
Improved diagnostics:
- List possible values when the value is unexpected
- Suggest if possible a name or value that is similar
Add more tests (well known names, mix of combinations, ...)

r? @petrochenkov

src/doc/unstable-book/src/compiler-flags/check-cfg.md

src/test/ui/check-cfg/well-known-names.rs

src/doc/unstable-book/src/compiler-flags/check-cfg.md

compiler/rustc_attr/src/builtin.rs

compiler/rustc_lint/src/context.rs

compiler/rustc_session/src/config.rs

Urgau · 2022-02-22T15:32:49Z

I've address all review comments, except for #94175 (comment) and #94175 (comment) where I left a comment.
This is ready for a another review.

I also would like to apologies for my English mistakes, it's not my native language. I will try my best to make sure these mistakes doesn't happen again.

@rustbot ready

Urgau · 2022-02-22T20:57:46Z

Fixed #94175 (comment) and added a note when no value is expected ecd3a65.

@rustbot ready

compiler/rustc_session/src/config.rs

compiler/rustc_interface/src/interface.rs

petrochenkov · 2022-02-22T21:16:48Z

r=me with the remaining comments addressed and commits squashed appropriately.

Urgau · 2022-02-22T22:40:09Z

Fixed last remaining comments and squashed to 5 commits. This is ready for r=you.

@rustbot ready

petrochenkov · 2022-02-22T22:46:52Z

@bors r+

bors · 2022-02-22T22:46:54Z

📌 Commit 6e3f642 has been approved by petrochenkov

petrochenkov · 2022-02-24T10:47:57Z

@bors r+

bors · 2022-02-24T10:47:58Z

📌 Commit a556a2a has been approved by petrochenkov

bors · 2022-02-24T16:51:50Z

⌛ Testing commit a556a2a with merge d0a34dc40eba51c4cd4173f8fb56b4c562209c90...

bors · 2022-02-24T16:55:01Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2022-02-24T17:06:58Z

@bors retry (crates.io down)

…rochenkov Improve `--check-cfg` implementation This pull-request is a mix of improvements regarding the `--check-cfg` implementation: - Simpler internal representation (usage of `Option` instead of separate bool) - Add --check-cfg to the unstable book (based on the RFC) - Improved diagnostics: * List possible values when the value is unexpected * Suggest if possible a name or value that is similar - Add more tests (well known names, mix of combinations, ...) r? `@petrochenkov`

rust-log-analyzer · 2022-02-24T20:14:11Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

…rochenkov Improve `--check-cfg` implementation This pull-request is a mix of improvements regarding the `--check-cfg` implementation: - Simpler internal representation (usage of `Option` instead of separate bool) - Add --check-cfg to the unstable book (based on the RFC) - Improved diagnostics: * List possible values when the value is unexpected * Suggest if possible a name or value that is similar - Add more tests (well known names, mix of combinations, ...) r? `@petrochenkov`

…rochenkov Improve `--check-cfg` implementation This pull-request is a mix of improvements regarding the `--check-cfg` implementation: - Simpler internal representation (usage of `Option` instead of separate bool) - Add --check-cfg to the unstable book (based on the RFC) - Improved diagnostics: * List possible values when the value is unexpected * Suggest if possible a name or value that is similar - Add more tests (well known names, mix of combinations, ...) r? ``@petrochenkov``

Rollup of 9 pull requests Successful merges: - rust-lang#91795 (resolve/metadata: Stop encoding macros as reexports) - rust-lang#93714 (better ObligationCause for normalization errors in `can_type_implement_copy`) - rust-lang#94175 (Improve `--check-cfg` implementation) - rust-lang#94212 (Stop manually SIMDing in `swap_nonoverlapping`) - rust-lang#94242 (properly handle fat pointers to uninhabitable types) - rust-lang#94308 (Normalize main return type during mono item collection & codegen) - rust-lang#94315 (update auto trait lint for `PhantomData`) - rust-lang#94316 (Improve string literal unescaping) - rust-lang#94327 (Avoid emitting full macro body into JSON errors) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…, r=petrochenkov Always evaluate all cfg predicate in all() and any() This pull-request adjust the handling of the `all()` and `any()` to always evaluate every cfg predicate because not doing so result in accepting incorrect `cfg`: ```rust #[cfg(any(unix, foo::bar))] // Should error on foo::bar, but does not on unix platform (but does on non unix platform) fn foo1() {} #[cfg(all(foo, foo::bar))] // Should error on foo::bar, but does not fn foo2() {} #[cfg(all(foo::bar, foo))] // Correctly error on foo::bar fn foo3() {} #[cfg(any(foo::bar, foo))] // Correctly error on foo::bar fn foo4() {} ``` This pull-request take the side to directly turn it into a hard error instead of having a future incompatibility lint because the combination to get this incorrect behavior is unusual and highly probable that some code have this without noticing. A [search](https://cs.github.com/?scopeName=All+repos&scope=&q=lang%3Arust+%2Fany%5C%28%5Ba-zA-Z%5D%2C+%5Ba-zA-Z%5D%2B%3A%3A%5Ba-zA-Z%5D%2B%2F) on Github reveal no such instance nevertheless a Crater run should probably be done before merging this. This was discover in rust-lang#94175 when trying to lint on the second predicate. Also note that this seems to have being introduce with Rust 1.27.0: https://rust.godbolt.org/z/KnfqKv15f. r? `@petrochenkov`

rust-highfive assigned petrochenkov Feb 20, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 20, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2022

Urgau mentioned this pull request Feb 21, 2022

Tracking Issue for RFC 3013: Checking conditional compilation at compile time #82450

Closed

3 tasks

This comment has been minimized.

Sign in to view

Urgau force-pushed the check-cfg-improvements branch from aa754d7 to f36c077 Compare February 21, 2022 15:24

petrochenkov reviewed Feb 22, 2022

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 22, 2022

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 22, 2022

petrochenkov reviewed Feb 22, 2022

View reviewed changes

compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved

compiler/rustc_interface/src/interface.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2022

Urgau added 3 commits February 22, 2022 22:41

Improve CheckCfg internal representation

da896d3

Add test for well known names defined by rustc

fbe1c15

Improve diagnostic of the unexpected_cfgs lint

3d23477

Urgau force-pushed the check-cfg-improvements branch from ecd3a65 to 6e3f642 Compare February 22, 2022 22:37

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 22, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2022

Urgau mentioned this pull request Feb 23, 2022

Always evaluate all cfg predicate in all() and any() #94295

Merged

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 24, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2022

Manishearth mentioned this pull request Feb 24, 2022

Rollup of 5 pull requests #94328

Closed

Dylan-DPC mentioned this pull request Feb 24, 2022

Rollup of 9 pull requests #94331

Closed

This was referenced Feb 24, 2022

Rollup of 9 pull requests #94332

Closed

Rollup of 9 pull requests #94333

Merged

bors merged commit 000e38d into rust-lang:master Feb 25, 2022

rustbot added this to the 1.61.0 milestone Feb 25, 2022

danielhenrymantilla mentioned this pull request Apr 13, 2022

Regression w.r.t. lazy evaluation of cfg predicates #96018

Closed

Improve --check-cfg implementation #94175

Improve --check-cfg implementation #94175

Uh oh!

Conversation

Urgau commented Feb 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Urgau commented Feb 22, 2022

Uh oh!

Urgau commented Feb 22, 2022

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Feb 22, 2022

Uh oh!

Urgau commented Feb 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov commented Feb 22, 2022

Uh oh!

bors commented Feb 22, 2022

Uh oh!

petrochenkov commented Feb 24, 2022

Uh oh!

bors commented Feb 24, 2022

Uh oh!

bors commented Feb 24, 2022

Uh oh!

bors commented Feb 24, 2022

Uh oh!

Mark-Simulacrum commented Feb 24, 2022

Uh oh!

rust-log-analyzer commented Feb 24, 2022

Uh oh!

Uh oh!

Improve `--check-cfg` implementation #94175

Improve `--check-cfg` implementation #94175

Urgau commented Feb 20, 2022 •

edited

Loading

Urgau commented Feb 22, 2022 •

edited

Loading