Make the test cfg a userspace check-cfg
#131729
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-compiletest
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
Urgau
added
F-check-cfg
This comment has been minimized.
This comment has been minimized.
Urgau
force-pushed
the
check-cfg-test-userspace
branch
from
ef799aa to
60ada7a
Compare
3 tasks
|
Blocked on the FCP in rust-lang/compiler-team#785. |
rustbot
added
S-blocked
This comment was marked as resolved.
This comment was marked as resolved.
Urgau
force-pushed
the
check-cfg-test-userspace
branch
from
60ada7a to
bda2e89
Compare
onur-ozkan
reviewed
Nov 2, 2024
github-merge-queue bot
pushed a commit
to rust-lang/cargo
that referenced
this pull request
Dec 19, 2024
) ### What does this PR try to resolve? This PR adds the `test` cfg as a well known Cargo cfg as rust-lang/compiler-team#785 is now in FCP and before the compiler change. ### How should we test and review this PR? Look at the new argument passed and the test changes. ### Additional information Detailed motivation at rust-lang/compiler-team#785, but summary `test` is a weird well known cfg for `rustc` as it's mostly a convention and build system like Cargo may to set it conditionally (`lib.test = false` for Cargo, not done in this PR). Pre-require to rust-lang/rust#131729. r? @epage
|
The FCP in rust-lang/compiler-team#785 has completed and the Cargo change was done rust-lang/cargo#14963. This PR is therefore unblocked and ready. @rustbot labels -S-blocked -S-waiting-on-MCP +S-waiting-on-review +relnotes |
rustbot
added
S-waiting-on-review
3 tasks
|
@bors r+ |
bors
added
S-waiting-on-bors
Urgau
force-pushed
the
check-cfg-test-userspace
branch
from
bda2e89 to
c73d81e
Compare
|
Rebased. CI is passing. Re-approving. @bors r=petrochenkov |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#131729 (Make the `test` cfg a userspace check-cfg) - rust-lang#134241 (more concrete source url of std docs [V2]) - rust-lang#135042 (taint fcx on selection errors during unsizing) - rust-lang#135049 (Remove unused fields from RepeatElementCopy obligation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 3, 2025
Rollup merge of rust-lang#131729 - Urgau:check-cfg-test-userspace, r=petrochenkov Make the `test` cfg a userspace check-cfg This PR implements MCP rust-lang/compiler-team#785, which makes the `test` cfg a "userspace" check-cfg, i.e. no longer included in the well known cfg list. Things to do: - [x] Accept the MCP (rust-lang/compiler-team#785 (comment)) - [x] Mark `test` in Cargo (rust-lang/cargo#14963) `@rustbot` labels +S-waiting-on-MCP +F-check_cfg r? `@petrochenkov`
littledivy
added a commit
to denoland/deno_core
that referenced
this pull request
Jan 5, 2025
Pin the nightly version for now. Starting from nightly 2025-01-03, all
cfg(tests) produce compiler error:
```
error: unexpected `cfg` condition name: `test`
--> ops/op2/mod.rs:363:7
|
363 | #[cfg(test)]
| ^^^^
|
= help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `fmt_debug`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `ub_checks`, `unix`, and `windows`
= help: consider using a Cargo feature instead
= help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] }
= help: or consider adding `println!("cargo::rustc-check-cfg=cfg(test)");` to the top of the `build.rs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
= note: `-D unexpected-cfgs` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(unexpected_cfgs)]`
```
Seems related to rust-lang/rust#131729 and maybe
some changes haven't propagated to cargo yet?
scouten-adobe
added a commit
to contentauth/c2pa-rs
that referenced
this pull request
Jan 7, 2025
scouten-adobe
added a commit
to contentauth/c2pa-rs
that referenced
this pull request
Jan 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR implements MCP rust-lang/compiler-team#785, which makes the
testcfg a "userspace" check-cfg, i.e. no longer included in the well known cfg list.Things to do:
testin Cargo (Add thetestcfg as a well known cfg before of compiler change cargo#14963)@rustbot labels +S-waiting-on-MCP +F-check_cfg
r? @petrochenkov