Add warning against unexpected --cfg with --check-cfg #100574

Urgau · 2022-08-15T10:27:42Z

This PR adds a warning when an unexpected --cfg is specified but not in the specified list of --check-cfg.

This is the follow-up PR I mentioned in #99519.

r? @petrochenkov

compiler/rustc_session/src/config.rs

rustbot · 2022-08-28T17:12:15Z

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

Urgau · 2022-08-28T17:18:00Z

I've update the implementation to use a early lint pass. Let me know if there is something to change.

@rustbot ready

compiler/rustc_lint/src/builtin.rs

src/test/ui/check-cfg/mix.stderr

petrochenkov · 2022-08-29T18:10:10Z

Could you also add a test making sure that crate-level #![allow(unexpected_cfgs)] actually silences the lint?
@rustbot author

petrochenkov · 2022-08-30T12:52:10Z

@bors r+

bors · 2022-08-30T12:52:11Z

📌 Commit bc68381 has been approved by petrochenkov

It is now in the queue for this repository.

…henkov Add warning against unexpected --cfg with --check-cfg This PR adds a warning when an unexpected `--cfg` is specified but not in the specified list of `--check-cfg`. This is the follow-up PR I mentioned in rust-lang#99519. r? `@petrochenkov`

matthiaskrgr · 2022-08-31T16:24:55Z

@bors r- looks like some tests failed in a rolluup

---- [ui] src/test/ui/check-cfg/mix.rs stdout ----
diff of stderr:

28	LL | #[cfg_attr(uu, test)]
29	   |            ^^
30	
-	warning: unexpected condition value `bar` for condition name `feature`
-	   |
-	   = help: was set with `--cfg` but isn't in the `--check-cfg` expected values
-	
35	warning: unexpected `unknown_name` as condition name
36	   |
37	   = help: was set with `--cfg` but isn't in the `--check-cfg` expected names

+	
+	warning: unexpected condition value `bar` for condition name `feature`
+	   |
+	   = help: was set with `--cfg` but isn't in the `--check-cfg` expected values
38	
39	warning: unexpected `cfg` condition name
40	  --> $DIR/mix.rs:35:10

#101244

Urgau · 2022-08-31T19:10:30Z

I re-blessed the test output src/test/ui/check-cfg/mix.rs, should be good to go again.

@rustbot ready

Urgau · 2022-09-02T12:19:54Z

I've rebased to fix the conflict in compiler/rustc_lint_defs/src/builtin.rs from #94467.

@rustbot ready

petrochenkov · 2022-09-02T12:42:30Z

@bors r+

bors · 2022-09-02T12:42:31Z

📌 Commit eccdccf has been approved by petrochenkov

It is now in the queue for this repository.

…henkov Add warning against unexpected --cfg with --check-cfg This PR adds a warning when an unexpected `--cfg` is specified but not in the specified list of `--check-cfg`. This is the follow-up PR I mentioned in rust-lang#99519. r? `@petrochenkov`

bors · 2022-09-02T23:35:01Z

⌛ Testing commit eccdccf with merge be4f3777ade35de16e8a2fdba8acbe40e0ade7b9...

bors · 2022-09-03T00:02:33Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-09-03T00:04:41Z

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)

[RUSTC-TIMING] collectionsbenches test:true 66.486
[RUSTC-TIMING] collectionstests test:true 67.485
[RUSTC-TIMING] coretests test:true 93.299
[RUSTC-TIMING] alloc test:true 107.707
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

Urgau · 2022-09-03T09:24:51Z

== clock drift check ==
local time: Sat Sep 3 00:01:48 UTC 2022
Session terminated, killing shell... ...killed.
time="2022-09-03T00:01:48Z" level=error msg="error waiting for container: unexpected EOF"
network time:
Error: The operation was canceled.

Seems unrelated to the PR. Could be retried.

matthiaskrgr · 2022-09-03T09:37:17Z

@bors retry

bors · 2022-09-03T12:02:18Z

⌛ Testing commit eccdccf with merge 47d1cdb...

bors · 2022-09-03T14:23:52Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 47d1cdb to master...

rust-timer · 2022-09-03T15:38:46Z

Finished benchmarking commit (47d1cdb): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.2%	[2.4%, 4.9%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.7%	[-4.3%, -2.8%]	3
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	4.4%	[4.4%, 4.4%]	1
Regressions ❌ (secondary)	3.6%	[3.6%, 3.6%]	1
Improvements ✅ (primary)	-1.7%	[-1.7%, -1.7%]	1
Improvements ✅ (secondary)	-5.5%	[-6.7%, -4.4%]	3
All ❌✅ (primary)	1.3%	[-1.7%, 4.4%]	2

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

…trochenkov Remove `--check-cfg` checking of command line `--cfg` args Back in rust-lang#100574 we added to the `unexpected_cfgs` lint the checking of `--cfg` CLI arguments and emitted unexpected names and values for them. The implementation works as expected, but it's usability in particular when using it in combination with Cargo+`RUSTFLAGS` as people who set `RUSTFLAGS=--cfg=tokio_unstable` (or whatever) have `unexpected_cfgs` warnings on all of their crates is debatable. ~~To fix this issue this PR proposes that we split the CLI argument checking into it's own separate allow-by-default lint: `unexpected_cli_cfgs`.~~ ~~This has the advantage of letting people who want CLI warnings have them (although not by default anymore), while still linting on every unexpected cfg name and values in the code.~~ After some discussion with the Cargo team ([Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/check-cfg.20and.20RUSTFLAGS.20interaction)) and member of the compiler team (see below), I propose that we follow the suggestion from `@epage:` never check `--cfg` arguments, but still reserve us the possibility to do it later. We would still lint on unexpected cfgs found in the source code no matter the `--cfg` args passed. This mean reverting rust-lang#100574 but NOT rust-lang#99519. r? `@petrochenkov`

Rollup merge of rust-lang#117522 - Urgau:check-cfg-cli-own-lint, r=petrochenkov Remove `--check-cfg` checking of command line `--cfg` args Back in rust-lang#100574 we added to the `unexpected_cfgs` lint the checking of `--cfg` CLI arguments and emitted unexpected names and values for them. The implementation works as expected, but it's usability in particular when using it in combination with Cargo+`RUSTFLAGS` as people who set `RUSTFLAGS=--cfg=tokio_unstable` (or whatever) have `unexpected_cfgs` warnings on all of their crates is debatable. ~~To fix this issue this PR proposes that we split the CLI argument checking into it's own separate allow-by-default lint: `unexpected_cli_cfgs`.~~ ~~This has the advantage of letting people who want CLI warnings have them (although not by default anymore), while still linting on every unexpected cfg name and values in the code.~~ After some discussion with the Cargo team ([Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/check-cfg.20and.20RUSTFLAGS.20interaction)) and member of the compiler team (see below), I propose that we follow the suggestion from `@epage:` never check `--cfg` arguments, but still reserve us the possibility to do it later. We would still lint on unexpected cfgs found in the source code no matter the `--cfg` args passed. This mean reverting rust-lang#100574 but NOT rust-lang#99519. r? `@petrochenkov`

Remove `--check-cfg` checking of command line `--cfg` args Back in rust-lang/rust#100574 we added to the `unexpected_cfgs` lint the checking of `--cfg` CLI arguments and emitted unexpected names and values for them. The implementation works as expected, but it's usability in particular when using it in combination with Cargo+`RUSTFLAGS` as people who set `RUSTFLAGS=--cfg=tokio_unstable` (or whatever) have `unexpected_cfgs` warnings on all of their crates is debatable. ~~To fix this issue this PR proposes that we split the CLI argument checking into it's own separate allow-by-default lint: `unexpected_cli_cfgs`.~~ ~~This has the advantage of letting people who want CLI warnings have them (although not by default anymore), while still linting on every unexpected cfg name and values in the code.~~ After some discussion with the Cargo team ([Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/check-cfg.20and.20RUSTFLAGS.20interaction)) and member of the compiler team (see below), I propose that we follow the suggestion from `@epage:` never check `--cfg` arguments, but still reserve us the possibility to do it later. We would still lint on unexpected cfgs found in the source code no matter the `--cfg` args passed. This mean reverting rust-lang/rust#100574 but NOT rust-lang/rust#99519. r? `@petrochenkov`

rust-highfive assigned petrochenkov Aug 15, 2022

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

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

Urgau commented Aug 15, 2022

View reviewed changes

compiler/rustc_session/src/config.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 Aug 27, 2022

Urgau force-pushed the check-cfg-warn-cfg branch from ae164df to cf5c9c1 Compare August 28, 2022 17:12

rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Aug 28, 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 Aug 28, 2022

Urgau force-pushed the check-cfg-warn-cfg branch from cf5c9c1 to 7fb1838 Compare August 28, 2022 17:22

Urgau commented Aug 28, 2022

View reviewed changes

compiler/rustc_lint/src/builtin.rs Outdated Show resolved Hide resolved

petrochenkov reviewed Aug 29, 2022

View reviewed changes

src/test/ui/check-cfg/mix.stderr 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 Aug 29, 2022

Urgau force-pushed the check-cfg-warn-cfg branch from 7fb1838 to bc68381 Compare August 29, 2022 21:06

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 30, 2022

matthiaskrgr mentioned this pull request Aug 31, 2022

Rollup of 9 pull requests #101244

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 Aug 31, 2022

Urgau force-pushed the check-cfg-warn-cfg branch from bc68381 to f8af919 Compare August 31, 2022 17:45

Add warning against unexpected --cfg with --check-cfg

eccdccf

Urgau force-pushed the check-cfg-warn-cfg branch from 83da34e to eccdccf Compare September 2, 2022 12:17

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 2, 2022

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 2, 2022

Dylan-DPC mentioned this pull request Sep 2, 2022

Rollup of 7 pull requests #101327

Closed

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 Sep 3, 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 Sep 3, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 3, 2022

bors merged commit 47d1cdb into rust-lang:master Sep 3, 2022

rustbot added this to the 1.65.0 milestone Sep 3, 2022

Urgau mentioned this pull request Nov 2, 2023

Remove --check-cfg checking of command line --cfg args #117522

Merged

epage mentioned this pull request Nov 16, 2023

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

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add warning against unexpected --cfg with --check-cfg #100574

Add warning against unexpected --cfg with --check-cfg #100574

Urgau commented Aug 15, 2022

rustbot commented Aug 28, 2022

Urgau commented Aug 28, 2022

petrochenkov commented Aug 29, 2022

petrochenkov commented Aug 30, 2022

bors commented Aug 30, 2022

matthiaskrgr commented Aug 31, 2022

Urgau commented Aug 31, 2022

Urgau commented Sep 2, 2022

petrochenkov commented Sep 2, 2022

bors commented Sep 2, 2022

bors commented Sep 2, 2022

bors commented Sep 3, 2022

rust-log-analyzer commented Sep 3, 2022

Urgau commented Sep 3, 2022

matthiaskrgr commented Sep 3, 2022

bors commented Sep 3, 2022

bors commented Sep 3, 2022

rust-timer commented Sep 3, 2022

Add warning against unexpected --cfg with --check-cfg #100574

Add warning against unexpected --cfg with --check-cfg #100574

Conversation

Urgau commented Aug 15, 2022

rustbot commented Aug 28, 2022

Urgau commented Aug 28, 2022

petrochenkov commented Aug 29, 2022

petrochenkov commented Aug 30, 2022

bors commented Aug 30, 2022

matthiaskrgr commented Aug 31, 2022

Urgau commented Aug 31, 2022

Urgau commented Sep 2, 2022

petrochenkov commented Sep 2, 2022

bors commented Sep 2, 2022

bors commented Sep 2, 2022

bors commented Sep 3, 2022

rust-log-analyzer commented Sep 3, 2022

Urgau commented Sep 3, 2022

matthiaskrgr commented Sep 3, 2022

bors commented Sep 3, 2022

bors commented Sep 3, 2022

rust-timer commented Sep 3, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes