Improve support of condition compilation checking #10566

Urgau · 2022-04-14T12:28:56Z

This PR is a series of improvements to the check-cfg implementation.

What does this PR try to resolve?

This PR resolve the concern expressed in #10486 (comment) that is:

Fixing the tests on Windows: e8aa51d
Merging all the -Z flags under -Zcheck-cfg: 969e282
Moving of all of the check-cfg tests into a separate module: c18b442
And removing of an unused parameter: 068bdf4

How should we test and review this PR?

This PR should be reviewed commit by commit and tested with the automated tests or examples.

Additional information

I decided to use a custom macro to make the test functional under Windows, the macro generate a contains line with the correct escaping depending on the platform (windows or not windows).

rust-highfive · 2022-04-14T12:28:59Z

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

ehuss

Thanks for the follow up!

src/doc/src/reference/unstable.md

tests/testsuite/check_cfg.rs

ehuss · 2022-05-06T19:49:15Z

Thanks!

@bors r+

bors · 2022-05-06T19:49:17Z

📌 Commit 94acc49bd95edadb49436e0c69c41a6a85343e41 has been approved by ehuss

bors · 2022-05-06T20:30:22Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout check-cfg-improvements (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self check-cfg-improvements --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/testsuite/main.rs
Auto-merging tests/testsuite/doc.rs
CONFLICT (content): Merge conflict in tests/testsuite/doc.rs
Auto-merging src/doc/src/reference/unstable.md
Automatic merge failed; fix conflicts and then commit the result.

Urgau · 2022-05-06T21:45:02Z

Conflict fixed.

@rustbot ready

ehuss · 2022-05-06T22:38:57Z

@bors r+

bors · 2022-05-06T22:38:59Z

📌 Commit 6f2fae1 has been approved by ehuss

bors · 2022-05-06T22:39:05Z

⌛ Testing commit 6f2fae1 with merge 6878c43...

bors · 2022-05-06T23:22:51Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 6878c43 to master...

Update cargo 20 commits in a44758ac805600edbb6ba51e7e6fb81a6077c0cd..3f052d8eed98c6a24f8b332fb2e6e6249d12d8c1 2022-05-04 02:29:34 +0000 to 2022-05-12 15:19:04 +0000 - pre-stabilization documentation for workspace inheritance (rust-lang/cargo#10659) - test: Make curr_dir work in/out of workspace (rust-lang/cargo#10658) - Fix no_cross_doctests race condition. (rust-lang/cargo#10660) - Fix typo (rust-lang/cargo#10657) - feat(install): Support `foo@version` like cargo-add (rust-lang/cargo#10650) - fix typos found by the `typos-cli` crate (rust-lang/cargo#10649) - feat(yank): Support foo@version like cargo-add (rust-lang/cargo#10597) - add `cargo-features` to unstable docs for workspace inheritance (rust-lang/cargo#10648) - Use the traits added to the Rust 2021 Edition prelude (rust-lang/cargo#10646) - Pass `--target` to `rustdoc` for `cargo test` if specified with host target. (rust-lang/cargo#10594) - Fix use of .. in dep-info-basedir (rust-lang/cargo#10281) - fix some typos (rust-lang/cargo#10639) - Move snapshot tests into testsuite (rust-lang/cargo#10638) - Improve support of condition compilation checking (rust-lang/cargo#10566) - When documenting private items in a binary, ignore warnings about links to private items (rust-lang/cargo#10142) - Extend pkgid syntax with ``@`` support (rust-lang/cargo#10582) - move one `snapshot/add` test into `testsuite/cargo_add/` (rust-lang/cargo#10631) - Add caveat for covering features (rust-lang/cargo#10605) - Improve CARGO_ENCODED_RUSTFLAGS and CARGO_ENCODED_RUSTDOCFLAGS variables docs (rust-lang/cargo#10633) - reorganize `snapshot` tests to better work in contexts that sort by extension (rust-lang/cargo#10629)

…ehuss Fix deserialization of check-cfg in config.toml When improving the check-cfg implementation in #10566 I changed the internal representation of `check_cfg` from multiple `bool` options to one `Option<(bool, bool, bool, bool)>` but I didn't realize until rust-lang/rust#82450 (comment) that the internal representation is actually somewhat public as it's used in the `[unstable]` in `.cargo/config.toml`. And because TOML cannot represent tuples there is no way to set it from the `[unstable]` section. This PR fix this oversight by using a custom deserializer method similar to what was already done for `build-std`.

rust-highfive assigned ehuss Apr 14, 2022

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

Urgau mentioned this pull request Apr 14, 2022

Add support for rustc --check-cfg well known names and values #10486

Merged

Urgau force-pushed the check-cfg-improvements branch from 068bdf4 to 868da2a Compare April 14, 2022 13:33

ehuss reviewed May 3, 2022

View reviewed changes

src/doc/src/reference/unstable.md Outdated Show resolved Hide resolved

tests/testsuite/check_cfg.rs Show resolved Hide resolved

tests/testsuite/check_cfg.rs Outdated Show resolved Hide resolved

Urgau force-pushed the check-cfg-improvements branch from 868da2a to 94acc49 Compare May 3, 2022 21:09

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 May 6, 2022

bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 6, 2022

Urgau added 5 commits May 6, 2022 22:40

Merge of unstable check-cfg cargo flags into -Zcheck-cfg

43c193a

Convert the testsuite to use the new -Zcheck-cfg flag and syntax

6a9f094

Move check cfg tests to their own module

2d0ca84

Re-enable check-cfg tests under windows with a custom macro for escaping

cf496db

Remove now unused context arg

6f2fae1

Urgau force-pushed the check-cfg-improvements branch from 94acc49 to 6f2fae1 Compare May 6, 2022 20:43

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels May 6, 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 May 6, 2022

bors merged commit 6878c43 into rust-lang:master May 6, 2022

bors mentioned this pull request May 6, 2022

Add target-specific RUSTFLAGS variants #10462

Closed

Urgau mentioned this pull request May 7, 2022

Add unstable rustc-check-cfg build script output #10539

Merged

weihanglo mentioned this pull request May 7, 2022

Tracking Issue for rustc --check-cfg integration #10554

Closed

2 tasks

ehuss mentioned this pull request May 12, 2022

Update cargo rust-lang/rust#96984

Merged

ehuss added this to the 1.62.0 milestone May 20, 2022

Urgau mentioned this pull request May 20, 2022

Tracking Issue for RFC 3013: Checking conditional compilation at compile time rust-lang/rust#82450

Closed

3 tasks

Urgau mentioned this pull request Jun 29, 2022

Fix deserialization of check-cfg in config.toml #10799

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve support of condition compilation checking #10566

Improve support of condition compilation checking #10566

Urgau commented Apr 14, 2022 •

edited

Loading

rust-highfive commented Apr 14, 2022

ehuss left a comment

ehuss commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

Urgau commented May 6, 2022

ehuss commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

Improve support of condition compilation checking #10566

Improve support of condition compilation checking #10566

Conversation

Urgau commented Apr 14, 2022 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rust-highfive commented Apr 14, 2022

ehuss left a comment

Choose a reason for hiding this comment

ehuss commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

Urgau commented May 6, 2022

ehuss commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

bors commented May 6, 2022

Urgau commented Apr 14, 2022 •

edited

Loading