Adjust `-Zcheck-cfg` for new rustc syntax and behavior #12845

Urgau · 2023-10-18T12:25:01Z

rust-lang/rust#111072 introduced a new syntax for rustc --check-cfg argument. This PR adjust cargo -Zcheck-cfg for new that new syntax and behavior.

This PR removes all the -Zcheck-cfg options (features, names, values, output), as they don't make much sense now since with the new rustc behavior: features, names and values are all combine together and the output option was only here because the other were.

Now the new behavior from cargo is to always pass one --check-cfg argument to rustc for the features which implicitly enables well known names and values.

rustbot · 2023-10-18T12:25:07Z

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

This commit removes all the -Zcheck-cfg options (features, names, values, output), as they don't make much sense now since features, names and values are all combine together for upstream rustc and the output option was only here because the other were. Now the new behavior from cargo is to always pass one `--check-cfg` argument to rustc for the `feature`s which implicitly enables well known names and values.

epage · 2023-10-18T15:57:23Z

FYI I have https://internals.rust-lang.org/t/pre-rfc-mutually-excusive-global-features/19618 as a way for users to define cfgs that can be checked. It has some implications for --check-cfgs design. Input on that Pre-RFC would be appreciated.

src/cargo/core/features.rs

epage · 2023-10-18T16:18:00Z

@bors r+

bors · 2023-10-18T16:18:03Z

📌 Commit 2f79f15 has been approved by epage

It is now in the queue for this repository.

Urgau · 2023-10-18T16:20:53Z

FYI I have https://internals.rust-lang.org/t/pre-rfc-mutually-excusive-global-features/19618 as a way for users to define cfgs that can be checked. It has some implications for --check-cfgs design. Input on that Pre-RFC would be appreciated.

I've just read it a second time, and I don't see any potential problems for --check-cfg or --cfg.
The introduction of namespaces shouldn't be a problem for either of them.

bors · 2023-10-18T16:29:06Z

⌛ Testing commit 2f79f15 with merge 16629e6...

bors · 2023-10-18T17:25:36Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing 16629e6 to master...

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

…k-cfg, r=<try> Prepare the `bootstrap` tool for the new check-cfg syntax This PR prepare the `bootstrap` tool for the [new check-cfg syntax](rust-lang#111072) as well as the according [changes to Cargo](rust-lang/cargo#12845). Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly). r? bootstrap

…k-cfg, r=Kobzol Prepare the `bootstrap` tool for the new check-cfg syntax This PR prepare the `bootstrap` tool for the [new check-cfg syntax](rust-lang#111072) as well as the according [changes to Cargo](rust-lang/cargo#12845). ~~Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly).~~ r? bootstrap

They no longer exists: rust-lang/cargo#12845

Remove outdated option to `-Zcheck-cfg` warnings Forgot to remove those in #12845. Note: Would it make sense to have feature-gate tests for those? and if so what would be the recommended way?

Reflects the updates in Cargo nightly: rust-lang/cargo#12845

…Kobzol Prepare the `bootstrap` tool for the new check-cfg syntax This PR prepare the `bootstrap` tool for the [new check-cfg syntax](rust-lang/rust#111072) as well as the according [changes to Cargo](rust-lang/cargo#12845). ~~Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly).~~ r? bootstrap

They no longer exists: rust-lang/cargo#12845

…Kobzol Prepare the `bootstrap` tool for the new check-cfg syntax This PR prepare the `bootstrap` tool for the [new check-cfg syntax](rust-lang/rust#111072) as well as the according [changes to Cargo](rust-lang/cargo#12845). ~~Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly).~~ r? bootstrap

rustbot assigned weihanglo Oct 18, 2023

rustbot added A-build-execution Area: anything dealing with executing the compiler A-build-scripts Area: build.rs scripts A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 18, 2023

Urgau force-pushed the check-cfg-adjust-for-rustc branch from 459d194 to 4b93690 Compare October 18, 2023 13:10

epage reviewed Oct 18, 2023

View reviewed changes

src/cargo/core/features.rs Show resolved Hide resolved

Update Cargo reference for new -Zcheck-cfg behavior and syntax

2f79f15

rustbot added the A-documenting-cargo-itself Area: Cargo's documentation label Oct 18, 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 18, 2023

bors merged commit 16629e6 into rust-lang:master Oct 18, 2023
19 checks passed

Urgau deleted the check-cfg-adjust-for-rustc branch October 18, 2023 17:28

Urgau mentioned this pull request Oct 20, 2023

Prepare the bootstrap tool for the new check-cfg syntax rust-lang/rust#116983

Merged

weihanglo mentioned this pull request Oct 20, 2023

Update cargo rust-lang/rust#117000

Merged

This was referenced Oct 23, 2023

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

Closed

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

Closed

Urgau added a commit to Urgau/libc that referenced this pull request Oct 27, 2023

Remove all options to cargo -Zcheck-cfg

63e1ce2

They no longer exists: rust-lang/cargo#12845

Urgau mentioned this pull request Oct 27, 2023

Remove outdated option to -Zcheck-cfg warnings #12884

Merged

illicitonion added a commit to illicitonion/num_enum that referenced this pull request Oct 27, 2023

Update check-cfg flag

19efbee

Reflects the updates in Cargo nightly: rust-lang/cargo#12845

illicitonion mentioned this pull request Oct 27, 2023

Update check-cfg flag illicitonion/num_enum#135

Merged

illicitonion added a commit to illicitonion/num_enum that referenced this pull request Oct 27, 2023

Update check-cfg flag (#135)

7b3797f

Reflects the updates in Cargo nightly: rust-lang/cargo#12845

ehuss added this to the 1.75.0 milestone Nov 6, 2023

snogge pushed a commit to snogge/rust-lang-libc that referenced this pull request Jan 15, 2024

Remove all options to cargo -Zcheck-cfg

50f7e70

They no longer exists: rust-lang/cargo#12845

snogge pushed a commit to snogge/rust-lang-libc that referenced this pull request Jan 15, 2024

Remove all options to cargo -Zcheck-cfg

e4de4dd

They no longer exists: rust-lang/cargo#12845

snogge pushed a commit to snogge/rust-lang-libc that referenced this pull request Jan 15, 2024

Remove all options to cargo -Zcheck-cfg

f6beb48

They no longer exists: rust-lang/cargo#12845

snogge pushed a commit to snogge/rust-lang-libc that referenced this pull request Jan 26, 2024

Remove all options to cargo -Zcheck-cfg

65ab7f8

They no longer exists: rust-lang/cargo#12845

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adjust `-Zcheck-cfg` for new rustc syntax and behavior #12845

Adjust `-Zcheck-cfg` for new rustc syntax and behavior #12845

Urgau commented Oct 18, 2023

rustbot commented Oct 18, 2023

epage commented Oct 18, 2023

epage commented Oct 18, 2023

bors commented Oct 18, 2023

Urgau commented Oct 18, 2023

bors commented Oct 18, 2023

bors commented Oct 18, 2023

Adjust -Zcheck-cfg for new rustc syntax and behavior #12845

Adjust -Zcheck-cfg for new rustc syntax and behavior #12845

Conversation

Urgau commented Oct 18, 2023

rustbot commented Oct 18, 2023

epage commented Oct 18, 2023

epage commented Oct 18, 2023

bors commented Oct 18, 2023

Urgau commented Oct 18, 2023

bors commented Oct 18, 2023

bors commented Oct 18, 2023

Adjust `-Zcheck-cfg` for new rustc syntax and behavior #12845

Adjust `-Zcheck-cfg` for new rustc syntax and behavior #12845