Fix `unexpected_cfgs` lint on std by tesuji · Pull Request #125296 · rust-lang/rust

tesuji · 2024-05-19T23:43:10Z

r? rust-lang/compiler

rustbot · 2024-05-19T23:43:17Z

Failed to set assignee to Urgau: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

Noratrieb · 2024-05-20T09:32:05Z

can you find the place in src/bootstrap where it sets the check-cfg for std and attempt to remove it? That would be a simple way to ensure they continue to work.

Urgau · 2024-05-20T09:56:33Z

This is great, thanks.

can you find the place in src/bootstrap where it sets the check-cfg for std and attempt to remove it?

It won't work for now for this repository as we always build with the previous beta Cargo, and it doesn't know about the check-cfg lint config and even if it did it wouldn't take effect yet. So we must still have the corresponding keys in bootstrap:

rust/src/bootstrap/src/lib.rs

Lines 87 to 97 in f092f73

(Some(Mode::Std),"stdarch_intel_sde",None),
(Some(Mode::Std),"no_fp_fmt_parse",None),
(Some(Mode::Std),"no_global_oom_handling",None),
(Some(Mode::Std),"no_rc",None),
(Some(Mode::Std),"no_sync",None),
(Some(Mode::Std),"netbsd10",None),
(Some(Mode::Std),"backtrace_in_libstd",None),
/* Extra values not defined in the built-in targets yet, but used in std */
(Some(Mode::Std),"target_env",Some(&["libnx","p2"])),
(Some(Mode::Std),"target_os",Some(&["visionos"])),
(Some(Mode::Std),"target_arch",Some(&["arm64ec","spirv","nvptx","xtensa"])),

Further more there is currently a warning that is emitted on previous beta Cargo since check-cfg is unused their: warning: /checkout/library/alloc/Cargo.toml: unused manifest key: lints.rust.unexpected_cfgs.check-cfg

We are working on getting this warning removed on beta Cargo, rust-lang/cargo#13925.

Noratrieb · 2024-05-20T11:48:30Z


 # Make panics and failed asserts immediately abort without formatting any message
 panic_immediate_abort = ["core/panic_immediate_abort", "alloc/panic_immediate_abort"]
+restricted-std = []


this doesn't really make sense as a feature, using a feature = cfg is a bit weird.. could you put it into the check-cfg table instead of the feature here as well?

If it shouldn't be activated by users, then it shouldn't be Cargo feature to begin with, it should just be a normal "custom cfg": restricted_std.
T-cargo is also thinking of disallowing/warning when expecting a fake Cargo feature, https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/.60check-cfg.60.20and.20custom.20.60feature.60

Noratrieb · 2024-05-20T11:50:07Z

I see, makes sense, bootstrapping exists :D. r=me after removing the Cargo feature again.

Urgau · 2024-05-20T12:32:09Z

+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [


Could you add a comment saying that these check-cfg entries do not yet take effect for rust-lang/rust since we use beta Cargo, but that for users for -Zbuild-std it does take effect and that the unused warning in waiting for rust-lang/cargo#13925 to reach beta.

tesuji · 2024-05-20T15:10:44Z

@rustbot ready

michaelwoerister · 2024-05-21T08:05:38Z

@bors r=Nilstrieb,michaelwoerister

bors · 2024-05-21T08:06:45Z

📌 Commit 1196df8 has been approved by Nilstrieb,michaelwoerister

It is now in the queue for this repository.

Noratrieb · 2024-05-21T09:35:01Z

@bors r=Nilstrieb,michaelwoerister

bors · 2024-05-21T09:35:04Z

📌 Commit 68a594c has been approved by Nilstrieb,michaelwoerister

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#124570 (Miscellaneous cleanups) - rust-lang#124772 (Refactor documentation for Apple targets) - rust-lang#125011 (Add opt-for-size core lib feature flag) - rust-lang#125218 (Migrate `run-make/no-intermediate-extras` to new `rmake.rs`) - rust-lang#125225 (Use functions from `crt_externs.h` on iOS/tvOS/watchOS/visionOS) - rust-lang#125266 (compiler: add simd_ctpop intrinsic) - rust-lang#125348 (Small fixes to `std::path::absolute` docs) Failed merges: - rust-lang#125296 (Fix `unexpected_cfgs` lint on std) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-05-21T16:18:34Z

☔ The latest upstream changes (presumably #125358) made this pull request unmergeable. Please resolve the merge conflicts.

michaelwoerister · 2024-05-21T18:51:46Z

@bors r=Nilstrieb,michaelwoerister

bors · 2024-05-21T18:51:48Z

📌 Commit 30e0ab8 has been approved by Nilstrieb,michaelwoerister

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - rust-lang#124896 (miri: rename intrinsic_fallback_checks_ub to intrinsic_fallback_is_spec) - rust-lang#125015 (Pattern types: Prohibit generic args on const params) - rust-lang#125049 (Disallow cast with trailing braced macro in let-else) - rust-lang#125259 (An async closure may implement `FnMut`/`Fn` if it has no self-borrows) - rust-lang#125296 (Fix `unexpected_cfgs` lint on std) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125296 - tesuji:checkcfg-buildstd, r=Nilstrieb,michaelwoerister Fix `unexpected_cfgs` lint on std closesrust-lang#125291 r? rust-lang/compiler

fmease · 2024-05-22T21:49:55Z

bors sleepy @bors r-

bjorn3 · 2024-05-23T12:40:43Z

I'm still getting

warning: unexpected `cfg` condition value: `restricted-std`
--> library/std/src/lib.rs:216:17
|
216 | #![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `feature` are: `addr2line`, `as_crate`, `backtrace`, `compiler-builtins-c`, `compiler-builtins-mangled-names`, `compiler-builtins-mem`, `compiler-builtins-no-asm`, `compiler-builtins-weak-intrinsics`, `llvm-libunwind`, `miniz_oxide`, `object`, `optimize_for_size`, `panic-unwind`, `panic_immediate_abort`, `panic_unwind`, `profiler`, `profiler_builtins`, `std`, `std_detect_dlsym_getauxval`, `std_detect_env_override`, `std_detect_file_io`, and `system-llvm-libunwind`
= help: consider adding `restricted-std` as a feature in `Cargo.toml`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: requested on the command line with `-W unexpected-cfgs`
warning: unexpected `cfg` condition value: `restricted-std`
--> library/std/src/lib.rs:218:5
|
218 | feature = "restricted-std",
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `feature` are: `addr2line`, `as_crate`, `backtrace`, `compiler-builtins-c`, `compiler-builtins-mangled-names`, `compiler-builtins-mem`, `compiler-builtins-no-asm`, `compiler-builtins-weak-intrinsics`, `llvm-libunwind`, `miniz_oxide`, `object`, `optimize_for_size`, `panic-unwind`, `panic_immediate_abort`, `panic_unwind`, `profiler`, `profiler_builtins`, `std`, `std_detect_dlsym_getauxval`, `std_detect_env_override`, `std_detect_file_io`, and `system-llvm-libunwind`
= help: consider adding `restricted-std` as a feature in `Cargo.toml`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
warning: `std` (lib) generated 2 warnings

Urgau · 2024-05-23T12:43:36Z

@bjorn3 that's #125296 (comment), I think it would make sense to switch to restricted_std, if it's not supposed to be a Cargo feature.

… r=bjorn3 Cleanup check-cfg handling in core and std Follow-up to rust-lang#125296 where we: - expect any feature cfg in std, due to `#[path]` imports - move some check-cfg args inside the `build.rs` as per Cargo recommendation - and replace the fake Cargo feature `"restricted-std"` by the custom cfg `restricted_std` Fixesrust-lang#125296 (comment) r? `@bjorn3` (maybe, feel free to re-roll)

Rollup merge of rust-lang#125452 - Urgau:check-cfg-libraries-cleanup, r=bjorn3 Cleanup check-cfg handling in core and std Follow-up to rust-lang#125296 where we: - expect any feature cfg in std, due to `#[path]` imports - move some check-cfg args inside the `build.rs` as per Cargo recommendation - and replace the fake Cargo feature `"restricted-std"` by the custom cfg `restricted_std` Fixesrust-lang#125296 (comment) r? `@bjorn3` (maybe, feel free to re-roll)

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 19, 2024

rustbot assigned michaelwoerister May 19, 2024

Noratrieb reviewed May 20, 2024
View reviewed changes

Urgau reviewed May 20, 2024
View reviewed changes

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label May 20, 2024

michaelwoerister approved these changes May 21, 2024
View reviewed changes

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 21, 2024

bjorn3 reviewed May 21, 2024
View reviewed changes

Comment threadsrc/bootstrap/src/lib.rs

matthiaskrgr mentioned this pull request May 21, 2024
Rollup of 7 pull requests #125358
Merged

fmease mentioned this pull request May 21, 2024
Rollup of 6 pull requests #125372
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 May 21, 2024

tesuji added 5 commits May 21, 2024 18:17

Update check-cfg lists for core
63fe640

Update check-cfg lists for alloc
0734ae2

Update check-cfg lists for std
73602bf

addresss reviews
c7d2f45

tidy alphabetica
df3a320

maybe replace check-cfg values in bootstrap with ones in Cargo.toml
30e0ab8

tesuji force-pushed the checkcfg-buildstd branch from 68a594c to 30e0ab8Compare May 21, 2024 18:19

This comment was marked as resolved.
Sign in to view

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 May 21, 2024

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 21, 2024

fmease mentioned this pull request May 22, 2024
Rollup of 5 pull requests #125415
Merged

bors merged commit 8219fd2 into rust-lang:masterMay 22, 2024

rustbot added this to the 1.80.0 milestone May 22, 2024

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 May 22, 2024

Urgau mentioned this pull request May 22, 2024
Tons of unexpected_cfgs failures in portable-simd and backtrace doctests #124740
Closed

tesuji deleted the checkcfg-buildstd branch May 23, 2024 01:42

Urgau mentioned this pull request May 23, 2024
Cleanup check-cfg handling in core and std #125452
Merged

Urgau mentioned this pull request Jun 27, 2024
Cleanup bootstrap check-cfg #127026
Merged

Uh oh!

Uh oh!

Conversation

tesuji commented May 19, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 19, 2024

Uh oh!

Noratrieb commented May 20, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Urgau commented May 20, 2024

Uh oh!

NoratriebMay 20, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UrgauMay 20, 2024

Choose a reason for hiding this comment

Uh oh!

Noratrieb commented May 20, 2024

Uh oh!

Uh oh!

UrgauMay 20, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tesuji commented May 20, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

michaelwoerister commented May 21, 2024

Uh oh!

bors commented May 21, 2024

Uh oh!

Uh oh!

Noratrieb commented May 21, 2024

Uh oh!

bors commented May 21, 2024

Uh oh!

bors commented May 21, 2024

Uh oh!

This comment was marked as resolved.

michaelwoerister commented May 21, 2024

Uh oh!

bors commented May 21, 2024

Uh oh!

fmease commented May 22, 2024

Uh oh!

bjorn3 commented May 23, 2024

Uh oh!

Urgau commented May 23, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

tesuji commented May 19, 2024•
edited
Loading

Noratrieb commented May 20, 2024•
edited
Loading

NoratriebMay 20, 2024•
edited
Loading

tesuji commented May 20, 2024•
edited
Loading

Urgau commented May 23, 2024•
edited
Loading