Use `cfg_select` in `std::os` by hkBst · Pull Request #158252 · rust-lang/rust

hkBst · 2026-06-22T14:39:50Z

#81969 replaced cgf_if with bare cfg, but since cfg_select is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

rustbot · 2026-06-22T14:39:56Z

r? @clarfonthey

rustbot has assigned @clarfonthey.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: @ChrisDenton, libs
@ChrisDenton, libs expanded to 13 candidates
Random selection from Darksonn, JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt

jhpratt · 2026-06-22T20:58:47Z

r? jhpratt

@bors r+ rollup

rust-bors · 2026-06-22T20:58:50Z

📌 Commit 2e5cbdc has been approved by jhpratt

It is now in the queue for this repository.

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 4 pull requests Successful merges: - #157960 (delegation: add support for infers in generics) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158222 (format: ignore println newline in foreign format hints) - #158252 (Use `cfg_select` in `std::os`)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 6 pull requests Successful merges: - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158222 (format: ignore println newline in foreign format hints) - #158252 (Use `cfg_select` in `std::os`)

jhpratt · 2026-06-23T00:24:49Z

@bors r-

#158273 (comment)

rust-bors · 2026-06-23T00:24:55Z

This pull request was unapproved.

This PR was contained in a rollup (#158273), which was unapproved.

View changes since this unapproval

hkBst · 2026-06-23T04:44:28Z

	error: none of the predicates in this `cfg_select` evaluated to true
	  --> /rustc/111e8c1de1be1555fcb694e9082f2d5892bb90fe/library/std/src/os/mod.rs:48:1
	   |
	48 | / cfg_select! {
	49 | |     target_family = "unix" => {
	50 | |         pub mod unix;
	51 | |         #[cfg(target_vendor = "apple")]
	...  |
	65 | | }
	   | |_^

This reverts commit 7bc5016.

hkBst · 2026-06-23T04:53:06Z

I added an empty catch-all branch...

@rustbot ready

jhpratt · 2026-06-23T04:55:25Z

Works for me 🤷 I did verify that behavior was unchanged, but if that's what the compiler wants then so be it.

@bors r+

Rollup of 8 pull requests Successful merges: - #157960 (delegation: add support for infers in generics) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158222 (format: ignore println newline in foreign format hints) - #158252 (Use `cfg_select` in `std::os`) - #158257 ( fix escaping placeholder check in next solver normalization folder) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

…uwer Rollup of 16 pull requests Successful merges: - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #158020 (Update mingw-w64 C toolchain) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158257 ( fix escaping placeholder check in next solver normalization folder) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) Failed merges: - #158256 (Avoid parser panics bubbling out to proc macros)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

…uwer Rollup of 23 pull requests Successful merges: - #158315 (`rust-analyzer` subtree update) - #155739 (Add temporary scope to assert_eq and assert_ne) - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157527 (Move derive tests into their dedicated folder) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #158020 (Update mingw-w64 C toolchain) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158257 ( fix escaping placeholder check in next solver normalization folder) - #158263 (Only load the feature list once in the entire resolver) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) - #158300 (Improve unknown crate_type diagnostic suggestions) - #158304 (mailmap: update mu001999) Failed merges: - #158256 (Avoid parser panics bubbling out to proc macros)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 27 pull requests Successful merges: - #158315 (`rust-analyzer` subtree update) - #155739 (Add temporary scope to assert_eq and assert_ne) - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158053 (Optimize network address parser) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157527 (Move derive tests into their dedicated folder) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #158020 (Update mingw-w64 C toolchain) - #158039 (c-variadic: test that we use equality up to free lifetimes) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158257 ( fix escaping placeholder check in next solver normalization folder) - #158263 (Only load the feature list once in the entire resolver) - #158267 (FromUtf8Error::into_utf8_lossy better example and suggest use) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) - #158300 (Improve unknown crate_type diagnostic suggestions) - #158304 (mailmap: update mu001999) - #158309 (Update `rustc-literal-escaper` version to `0.0.8`) Failed merges: - #158256 (Avoid parser panics bubbling out to proc macros)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 35 pull requests Successful merges: - #158315 (`rust-analyzer` subtree update) - #158336 (Stop excluding `stdarch` test crates from `rust-src`) - #155739 (Add temporary scope to assert_eq and assert_ne) - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157419 (move rustc_type_ir Term things to term_kind.rs) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158053 (Optimize network address parser) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157527 (Move derive tests into their dedicated folder) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #157939 (Reorganize `tests/ui/issues` [8/N]) - #157946 (Make `char::is_private_use` and `char::is_assigned` unstably public) - #158003 (Reorganize `tests/ui/issues` [9/N]) - #158020 (Update mingw-w64 C toolchain) - #158039 (c-variadic: test that we use equality up to free lifetimes) - #158060 (Reorganize `tests/ui/issues` [10/N]) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158263 (Only load the feature list once in the entire resolver) - #158267 (FromUtf8Error::into_utf8_lossy better example and suggest use) - #158272 (Reorganize `tests/ui/issues` [13/N]) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) - #158300 (Improve unknown crate_type diagnostic suggestions) - #158304 (mailmap: update mu001999) - #158309 (Update `rustc-literal-escaper` version to `0.0.8`) - #158314 (Fix incorrect unsafe debug assertion in unchecked_div_exact) - #158326 (Add `io::ErrorKind::TooManyOpenFiles`)

Use `cfg_select` in `std::os` rust-lang#81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 35 pull requests Successful merges: - #158315 (`rust-analyzer` subtree update) - #158336 (Stop excluding `stdarch` test crates from `rust-src`) - #155739 (Add temporary scope to assert_eq and assert_ne) - #156885 (Fix misattributed type inference error span for index expressions) - #157271 (simplify some `proc_macro` things) - #157419 (move rustc_type_ir Term things to term_kind.rs) - #157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - #157921 (trait solver: Resolve region vars in max universe) - #157960 (delegation: add support for infers in generics) - #157983 (Lift the same-signature restriction for `extern "tail"`) - #158053 (Optimize network address parser) - #158105 (Extract all instance shim variants into new `ShimKind` enum) - #158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - #158279 (Follow goto and drop when linting unreachable code) - #157527 (Move derive tests into their dedicated folder) - #157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - #157939 (Reorganize `tests/ui/issues` [8/N]) - #157946 (Make `char::is_private_use` and `char::is_assigned` unstably public) - #158003 (Reorganize `tests/ui/issues` [9/N]) - #158020 (Update mingw-w64 C toolchain) - #158039 (c-variadic: test that we use equality up to free lifetimes) - #158060 (Reorganize `tests/ui/issues` [10/N]) - #158222 (format: ignore println newline in foreign format hints) - #158223 (Move target checking for #[lang] to the attribute parser) - #158252 (Use `cfg_select` in `std::os`) - #158263 (Only load the feature list once in the entire resolver) - #158267 (FromUtf8Error::into_utf8_lossy better example and suggest use) - #158272 (Reorganize `tests/ui/issues` [13/N]) - #158274 (triagebot: Stop pinging myself) - #158282 (slice_split_once: bounds check optimization note) - #158300 (Improve unknown crate_type diagnostic suggestions) - #158304 (mailmap: update mu001999) - #158309 (Update `rustc-literal-escaper` version to `0.0.8`) - #158314 (Fix incorrect unsafe debug assertion in unchecked_div_exact) - #158326 (Add `io::ErrorKind::TooManyOpenFiles`)

Rollup merge of #158252 - hkBst:std-os-cfg-select, r=jhpratt Use `cfg_select` in `std::os` #81969 replaced `cgf_if` with bare `cfg`, but since `cfg_select` is now built in, it shouldn't pose a problem to rust-analyzer any more, so we should be able to go back to better code.

Rollup of 35 pull requests Successful merges: - rust-lang/rust#158315 (`rust-analyzer` subtree update) - rust-lang/rust#158336 (Stop excluding `stdarch` test crates from `rust-src`) - rust-lang/rust#155739 (Add temporary scope to assert_eq and assert_ne) - rust-lang/rust#156885 (Fix misattributed type inference error span for index expressions) - rust-lang/rust#157271 (simplify some `proc_macro` things) - rust-lang/rust#157419 (move rustc_type_ir Term things to term_kind.rs) - rust-lang/rust#157883 (Remove strict invariant node_type on hir_type during ty privacy visit) - rust-lang/rust#157921 (trait solver: Resolve region vars in max universe) - rust-lang/rust#157960 (delegation: add support for infers in generics) - rust-lang/rust#157983 (Lift the same-signature restriction for `extern "tail"`) - rust-lang/rust#158053 (Optimize network address parser) - rust-lang/rust#158105 (Extract all instance shim variants into new `ShimKind` enum) - rust-lang/rust#158207 (Resolver: local/external split of `resolve_ident_in_module_non_globs_unadjusted` ) - rust-lang/rust#158279 (Follow goto and drop when linting unreachable code) - rust-lang/rust#157527 (Move derive tests into their dedicated folder) - rust-lang/rust#157807 (don't ice on non-lifetime binders under `-Zassumptions-on-binders`) - rust-lang/rust#157939 (Reorganize `tests/ui/issues` [8/N]) - rust-lang/rust#157946 (Make `char::is_private_use` and `char::is_assigned` unstably public) - rust-lang/rust#158003 (Reorganize `tests/ui/issues` [9/N]) - rust-lang/rust#158020 (Update mingw-w64 C toolchain) - rust-lang/rust#158039 (c-variadic: test that we use equality up to free lifetimes) - rust-lang/rust#158060 (Reorganize `tests/ui/issues` [10/N]) - rust-lang/rust#158222 (format: ignore println newline in foreign format hints) - rust-lang/rust#158223 (Move target checking for #[lang] to the attribute parser) - rust-lang/rust#158252 (Use `cfg_select` in `std::os`) - rust-lang/rust#158263 (Only load the feature list once in the entire resolver) - rust-lang/rust#158267 (FromUtf8Error::into_utf8_lossy better example and suggest use) - rust-lang/rust#158272 (Reorganize `tests/ui/issues` [13/N]) - rust-lang/rust#158274 (triagebot: Stop pinging myself) - rust-lang/rust#158282 (slice_split_once: bounds check optimization note) - rust-lang/rust#158300 (Improve unknown crate_type diagnostic suggestions) - rust-lang/rust#158304 (mailmap: update mu001999) - rust-lang/rust#158309 (Update `rustc-literal-escaper` version to `0.0.8`) - rust-lang/rust#158314 (Fix incorrect unsafe debug assertion in unchecked_div_exact) - rust-lang/rust#158326 (Add `io::ErrorKind::TooManyOpenFiles`)

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 Jun 22, 2026

rustbot assigned clarfonthey Jun 22, 2026

This comment has been minimized.

Sign in to view

rust-cloud-vms Bot force-pushed the std-os-cfg-select branch from df06a04 to 2e5cbdc Compare June 22, 2026 15:45

rustbot assigned jhpratt Jun 22, 2026

rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 22, 2026

rustbot unassigned clarfonthey Jun 22, 2026

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 22, 2026

jhpratt mentioned this pull request Jun 22, 2026

Rollup of 4 pull requests #158270

Closed

jhpratt mentioned this pull request Jun 22, 2026

Rollup of 6 pull requests #158273

Closed

rust-bors Bot 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 Jun 23, 2026

Use cfg_select in std::os

24d4439

This reverts commit 7bc5016.

rust-cloud-vms Bot force-pushed the std-os-cfg-select branch from 2e5cbdc to 24d4439 Compare June 23, 2026 04:51

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 Jun 23, 2026

JonathanBrouwer mentioned this pull request Jun 23, 2026

Rollup of 16 pull requests #158301

Closed

JonathanBrouwer mentioned this pull request Jun 23, 2026

Rollup of 23 pull requests #158316

Closed

JonathanBrouwer mentioned this pull request Jun 23, 2026

Rollup of 23 pull requests #158324

Closed

jhpratt mentioned this pull request Jun 24, 2026

Rollup of 27 pull requests #158335

Closed

This was referenced Jun 24, 2026

Rollup of 34 pull requests #158337

Closed

Rollup of 35 pull requests #158342

Merged

JonathanBrouwer mentioned this pull request Jun 24, 2026

[CI] Rollup of 35 pull requests #158354

Draft

rust-bors Bot merged commit 5497af1 into rust-lang:main Jun 25, 2026
13 checks passed

rustbot added this to the 1.98.0 milestone Jun 25, 2026

mkroening mentioned this pull request Jun 25, 2026

redundant-imports lint does not work in macro-defined modules #158400

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Use `cfg_select` in `std::os`#158252

Use `cfg_select` in `std::os`#158252
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
hkBst:std-os-cfg-select

hkBst commented Jun 22, 2026

Uh oh!

rustbot commented Jun 22, 2026

Uh oh!

This comment has been minimized.

jhpratt commented Jun 22, 2026

Uh oh!

rust-bors Bot commented Jun 22, 2026

Uh oh!

jhpratt commented Jun 23, 2026

Uh oh!

rust-bors Bot commented Jun 23, 2026

Uh oh!

hkBst commented Jun 23, 2026

Uh oh!

hkBst commented Jun 23, 2026

Uh oh!

jhpratt commented Jun 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

hkBst commented Jun 22, 2026

Uh oh!

rustbot commented Jun 22, 2026

Uh oh!

This comment has been minimized.

jhpratt commented Jun 22, 2026

Uh oh!

rust-bors Bot commented Jun 22, 2026

Uh oh!

jhpratt commented Jun 23, 2026

Uh oh!

rust-bors Bot commented Jun 23, 2026

Uh oh!

hkBst commented Jun 23, 2026

Uh oh!

hkBst commented Jun 23, 2026

Uh oh!

jhpratt commented Jun 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants