Skip to content

Remove useless conditional compilation#1308

Merged
Amanieu merged 1 commit intorust-lang:masterfrom
Urgau:cleanup-cfgs
Jun 9, 2022
Merged

Remove useless conditional compilation#1308
Amanieu merged 1 commit intorust-lang:masterfrom
Urgau:cleanup-cfgs

Conversation

@Urgau
Copy link
Member

@Urgau Urgau commented Jun 9, 2022

Context: rustc added a few month ago --check-cfg support and enable it in the rust-lang/rust repo for every build.

I found out that stdarch had condition that were triggering the unstable unexpected_cfgs lint:

  • stdarch_intel_sde: Internal to stdarch, status unknown, never set as far as I can tell. bootstrap exception
  • dont_compile_me: Used on the _rbit_u32 test for armv7, with an outdated comment. bootstrap exception
  • core_arch_docs: Set in dox.sh and in the build.rs of core_arch, but never used in the codebase. no exception because never used

This PR removes every cfg usage of dont_compile_me and core_arch_docs because they are useless. I tested the modifications and nothing failed on my side, so I think it's good to go.

@rust-highfive
Copy link

rust-highfive commented Jun 9, 2022

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

@Urgau
Copy link
Member Author

Urgau commented Jun 9, 2022

I would also like to remove stdarch_intel_sde. As far as I can tell it's only used with negative (#[cfg(not(stdarch_intel_sde))]) cfg and is never set by anything. Should I update the PR and also include it's removal ?

@Amanieu
Copy link
Member

Amanieu commented Jun 9, 2022

stdarch_intel_sde is set in .github/workflows/main.yml when running x86 tests under Intel's x86 emulator. This is used to test features that may not be available on the CPU used in CI.

@Amanieu
Copy link
Member

Amanieu commented Jun 9, 2022

The rest look fine to me.

@Amanieu Amanieu merged commit 6299dd0 into rust-lang:master Jun 9, 2022
@Urgau Urgau mentioned this pull request Jan 19, 2023
Merged
Urgau added a commit to Urgau/rust that referenced this pull request Jan 19, 2023
@Urgau
Cleanup extra check configs in bootstrap
cc00a21 
 - `target_os=watchos`: no longer relevant because there are now proper
   targets `*-apple-watchos`
 - `target_arch=nvptx64`: `nvptx64-nvidia-cuda`
 - `target_arch=le32`: target was removed
   (rust-lang#45041)
 - `dont_compile_me`: was removed from stdarch
   (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for
rustc and rustc tools (as to not have the Standard Library
unintentionally depend on them).
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 22, 2023
@compiler-errors
Rollup merge of rust-lang#107080 - Urgau:cleanup-bootstrap-extra-chec…
10057f5 
…k-cfgs, r=Mark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang#45041)
 - ~~`release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449 (despite the changes being done more than 6 months ago there hasn't been any rustfmt subtree sync)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
Urgau added a commit to Urgau/rust that referenced this pull request Jan 25, 2023
@Urgau
Cleanup extra check configs in bootstrap
a01a540 
 - `target_os=watchos`: no longer relevant because there are now proper
   targets `*-apple-watchos`
 - `target_arch=nvptx64`: `nvptx64-nvidia-cuda`
 - `target_arch=le32`: target was removed
   (rust-lang#45041)
 - `release`: was removed from rustfmt
   (rust-lang/rustfmt#5375 and
   rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch
   (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for
rustc and rustc tools (as to not have the Standard Library
unintentionally depend on them).
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 29, 2023
@compiler-errors
Rollup merge of rust-lang#107080 - Urgau:cleanup-bootstrap-extra-chec…
7389172 
…k-cfgs, r=Mark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang#45041)
 - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2023
@bors
Auto merge of rust-lang#107080 - Urgau:cleanup-bootstrap-extra-check-…
006ca9b 
…cfgs, r=Mark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang#45041)
 - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
bors added a commit to rust-lang/miri that referenced this pull request Jan 31, 2023
@bors
Auto merge of #107080 - Urgau:cleanup-bootstrap-extra-check-cfgs, r=M…
7a03fa2 
…ark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang/rust#45041)
 - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
thomcc pushed a commit to pgcentralfoundation/postgrestd that referenced this pull request May 31, 2023
@bors
Auto merge of #107080 - Urgau:cleanup-bootstrap-extra-check-cfgs, r=M…
deb5c38 
…ark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang/rust#45041)
 - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Amanieu Amanieu

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Urgau @rust-highfive @Amanieu