Skip to content

Improve --check-cfg implementation - #94175

Merged
bors merged 5 commits into
rust-lang:masterfrom
Urgau:check-cfg-improvements
Feb 25, 2022
Merged

Improve --check-cfg implementation#94175
bors merged 5 commits into
rust-lang:masterfrom
Urgau:check-cfg-improvements

Conversation

@Urgau

@UrgauUrgau commented Feb 20, 2022•
edited
Loading

Copy link
Copy Markdown
Member

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

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 20, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2022
@UrgauUrgau mentioned this pull request Feb 21, 2022
Closed
3 tasks
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Urgau
Urgauforce-pushed the check-cfg-improvements branch from aa754d7 to f36c077CompareFebruary 21, 2022 15:24
petrochenkov
petrochenkov reviewed Feb 22, 2022
View reviewed changes
Comment threadsrc/doc/unstable-book/src/compiler-flags/check-cfg.md Outdated
Comment threadsrc/test/ui/check-cfg/well-known-names.rs Outdated
Comment threadsrc/doc/unstable-book/src/compiler-flags/check-cfg.md Outdated
Comment threadsrc/doc/unstable-book/src/compiler-flags/check-cfg.md Outdated
Comment threadcompiler/rustc_attr/src/builtin.rs Outdated
Comment threadcompiler/rustc_lint/src/context.rs Outdated
Comment threadcompiler/rustc_lint/src/context.rs Outdated
Comment threadcompiler/rustc_lint/src/context.rs Outdated
Comment threadcompiler/rustc_lint/src/context.rs Outdated
Comment threadcompiler/rustc_session/src/config.rs Outdated
@petrochenkovpetrochenkov 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

Urgau commented Feb 22, 2022

Copy link
Copy Markdown
MemberAuthor

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

@rustbotrustbot 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
@petrochenkovpetrochenkov 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

Urgau commented Feb 22, 2022

Copy link
Copy Markdown
MemberAuthor

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

@rustbot ready

@rustbotrustbot 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
petrochenkov reviewed Feb 22, 2022
View reviewed changes
Comment threadcompiler/rustc_session/src/config.rs Outdated
Comment threadcompiler/rustc_interface/src/interface.rs Outdated
@petrochenkov

petrochenkov commented Feb 22, 2022

Copy link
Copy Markdown
Contributor

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

@petrochenkovpetrochenkov 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
Urgauforce-pushed the check-cfg-improvements branch from ecd3a65 to 6e3f642CompareFebruary 22, 2022 22:37
@Urgau

Urgau commented Feb 22, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

@rustbot ready

@rustbotrustbot 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

petrochenkov commented Feb 22, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 22, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 6e3f642 has been approved by petrochenkov

@rustbotrustbot 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
@UrgauUrgau mentioned this pull request Feb 23, 2022
Merged
@petrochenkov

petrochenkov commented Feb 24, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 24, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a556a2a has been approved by petrochenkov

@borsbors 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

bors commented Feb 24, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a556a2a with merge d0a34dc40eba51c4cd4173f8fb56b4c562209c90...

@bors

bors commented Feb 24, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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
@Mark-Simulacrum

Mark-Simulacrum commented Feb 24, 2022

Copy link
Copy Markdown
Member

@bors retry (crates.io down)

@borsbors 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 added a commit to Manishearth/rust that referenced this pull request Feb 24, 2022
@Manishearth
Rollup merge ofrust-lang#94175- Urgau:check-cfg-improvements, r=pet…
1d665f4
…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`
@ManishearthManishearth mentioned this pull request Feb 24, 2022
Closed
@rust-log-analyzer

rust-log-analyzer commented Feb 24, 2022

Copy link
Copy Markdown
Collaborator

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)

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 24, 2022
@Dylan-DPC
Rollup merge ofrust-lang#94175- Urgau:check-cfg-improvements, r=pet…
92b5d1d
…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`
@Dylan-DPCDylan-DPC mentioned this pull request Feb 24, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 24, 2022
@Dylan-DPC
Rollup merge ofrust-lang#94175- Urgau:check-cfg-improvements, r=pet…
ce99d7b
…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``
This was referenced Feb 24, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2022
@bors
Auto merge ofrust-lang#94333- Dylan-DPC:rollup-7yxtywp, r=Dylan-DPC
4e82f35
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
@bors
bors merged commit 000e38d into rust-lang:masterFeb 25, 2022
@rustbotrustbot added this to the 1.61.0 milestone Feb 25, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 18, 2022
@matthiaskrgr
Rollup merge ofrust-lang#94295- Urgau:cfg-always-eval-all-predicate…
d15006c
…, 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`
@danielhenrymantilladanielhenrymantilla mentioned this pull request Apr 13, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

8 participants

@Urgau@rust-log-analyzer@petrochenkov@bors@matthiaskrgr@Mark-Simulacrum@rust-highfive@rustbot