Cleanup and improve `--check-cfg` implementation #117025

Urgau · 2023-10-21T17:16:22Z

This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc.

r? @petrochenkov (maybe)

compiler/rustc_interface/src/interface.rs

petrochenkov · 2023-10-26T17:49:38Z

r=me with #117025 (comment) addressed.
@rustbot author

Urgau · 2023-10-26T20:30:53Z

#117025 (comment) has been addressed

@rustbot ready
(since I don't have bors rights)

petrochenkov · 2023-10-26T21:23:17Z

@bors r+

bors · 2023-10-26T21:23:20Z

📌 Commit e2122e7 has been approved by petrochenkov

It is now in the queue for this repository.

…pl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? `@petrochenkov` (maybe)

Rollup of 5 pull requests Successful merges: - rust-lang#116858 (Suggest assoc fn `new` when trying to build tuple struct with private fields) - rust-lang#116868 (Tweak suggestion span for outer attr and point at item following invalid inner attr) - rust-lang#117025 (Cleanup and improve `--check-cfg` implementation) - rust-lang#117170 (Add support for i586-unknown-netbsd as target.) - rust-lang#117240 (Fix documentation typo in std::iter::Iterator::collect_into) r? `@ghost` `@rustbot` modify labels: rollup

…pl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? ``@petrochenkov`` (maybe)

Rollup of 5 pull requests Successful merges: - rust-lang#114998 (feat(docs): add cargo-pgo to PGO documentation 📝) - rust-lang#116858 (Suggest assoc fn `new` when trying to build tuple struct with private fields) - rust-lang#116868 (Tweak suggestion span for outer attr and point at item following invalid inner attr) - rust-lang#117025 (Cleanup and improve `--check-cfg` implementation) - rust-lang#117240 (Fix documentation typo in std::iter::Iterator::collect_into) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2023-10-27T09:47:07Z

@bors r-
https://github.com/rust-lang-ci/rust/actions/runs/6663550445/job/18109620159#step:25:29546
failed in #117264

Urgau · 2023-10-27T10:25:26Z

The libc crate is using custom check-cfg, but it's using the old-deprecated syntax preventing the anti-mixing check to be enabled.

We could disable those extra libc check-cfg, by unsetting the LIBC_CHECK_CFG env, but this might break downstream forks using custom patched libc. So until the libc crate is updated to support the new syntax, I've dropped the anti-mixing check (for now).

@rustbot ready

petrochenkov · 2023-10-27T10:39:49Z

I've dropped the anti-mixing check (for now).

I don't think that check is very important, the old syntax will be removed anyway and mixing will go away with it.

@bors r+

bors · 2023-10-27T10:39:51Z

📌 Commit 84a1a68 has been approved by petrochenkov

It is now in the queue for this repository.

…pl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? `@petrochenkov` (maybe)

…pl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? ``@petrochenkov`` (maybe)

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#116534 (Remove -Zdep-tasks.) - rust-lang#116609 (Bump stdarch submodule and remove special handling for LLVM intrinsics that are no longer needed) - rust-lang#116739 (Make `E0277` use short paths) - rust-lang#116945 (When encountering sealed traits, point types that implement it) - rust-lang#117025 (Cleanup and improve `--check-cfg` implementation) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) - rust-lang#117256 (Parse rustc version at compile time) - rust-lang#117277 (fix failure to detect a too-big-type after adding padding) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#116534 (Remove -Zdep-tasks.) - rust-lang#116739 (Make `E0277` use short paths) - rust-lang#116816 (Create `windows/api.rs` for safer FFI) - rust-lang#116945 (When encountering sealed traits, point types that implement it) - rust-lang#117025 (Cleanup and improve `--check-cfg` implementation) - rust-lang#117256 (Parse rustc version at compile time) - rust-lang#117268 (`rustc_interface` cleanups) - rust-lang#117277 (fix failure to detect a too-big-type after adding padding) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117025 - Urgau:cleanup-improve-check-cfg-impl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? ```@petrochenkov``` (maybe)

rustbot assigned petrochenkov Oct 21, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 21, 2023

petrochenkov reviewed Oct 26, 2023

View reviewed changes

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

rustbot 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 Oct 26, 2023

Urgau added 2 commits October 26, 2023 20:43

Remove most indentation in check-cfg impl

828f069

Fix residual (never merged) check-cfg syntax in doc

1ef96a9

Urgau force-pushed the cleanup-improve-check-cfg-impl branch from 9756777 to e2122e7 Compare October 26, 2023 18:43

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 Oct 26, 2023

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 Oct 26, 2023

TaKO8Ki mentioned this pull request Oct 27, 2023

Rollup of 5 pull requests #117255

Closed

TaKO8Ki mentioned this pull request Oct 27, 2023

Rollup of 5 pull requests #117264

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 27, 2023

Better guard against wrong input with check-cfg any()

84a1a68

Urgau force-pushed the cleanup-improve-check-cfg-impl branch from e2122e7 to 84a1a68 Compare October 27, 2023 10:03

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 27, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2023

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 Oct 27, 2023

GuillaumeGomez mentioned this pull request Oct 27, 2023

Rollup of 3 pull requests #117283

Closed

matthiaskrgr mentioned this pull request Oct 28, 2023

Rollup of 8 pull requests #117308

Closed

workingjubilee mentioned this pull request Oct 28, 2023

Rollup of 8 pull requests #117309

Merged

bors merged commit 87a564d into rust-lang:master Oct 28, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 28, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Urgau mentioned this pull request Nov 5, 2023

Prevent mixing deprecated check-cfg syntax with new one #117612

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup and improve `--check-cfg` implementation #117025

Cleanup and improve `--check-cfg` implementation #117025

Urgau commented Oct 21, 2023

petrochenkov commented Oct 26, 2023

Urgau commented Oct 26, 2023

petrochenkov commented Oct 26, 2023

bors commented Oct 26, 2023

matthiaskrgr commented Oct 27, 2023

Urgau commented Oct 27, 2023

petrochenkov commented Oct 27, 2023

bors commented Oct 27, 2023

Cleanup and improve --check-cfg implementation #117025

Cleanup and improve --check-cfg implementation #117025

Conversation

Urgau commented Oct 21, 2023

petrochenkov commented Oct 26, 2023

Urgau commented Oct 26, 2023

petrochenkov commented Oct 26, 2023

bors commented Oct 26, 2023

matthiaskrgr commented Oct 27, 2023

Urgau commented Oct 27, 2023

petrochenkov commented Oct 27, 2023

bors commented Oct 27, 2023

Cleanup and improve `--check-cfg` implementation #117025

Cleanup and improve `--check-cfg` implementation #117025