Further cleanup cfgs in the UI test suite #123702
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
This commit does three things: 1. replaces (the last remaining) never true cfgs by the FALSE cfg 2. fix derive-helper-configured.rs (typo in directive) 3. and comment some current unused #[cfg_attr] (missing revisions)
rustbot
added
S-waiting-on-review
jieyouxu
approved these changes
Apr 9, 2024
| @@ -1,17 +1,15 @@ | |||
| // Derive helpers are resolved successfully inside `cfg_attr`. | |||
|
|
|||
| //@ check-pass | |||
| // compile-flats:--cfg TRUE | |||
|
@bors delegate+ |
|
@bors rollup |
lqd
reviewed
Apr 9, 2024
| @@ -2,8 +2,8 @@ | |||
| // we use a single revision because this should have a `full` revision | |||
| // but right now that ICEs and I(@BoxyUwU) could not get stderr normalization to work | |||
|
|
|||
| #![cfg_attr(full, feature(generic_const_exprs))] | |||
| #![cfg_attr(full, allow(incomplete_features))] | |||
| // #![cfg_attr(full, feature(generic_const_exprs))] | |||
There was a problem hiding this comment.
Probably remove these instead of commenting them out? Here and in another file.
There was a problem hiding this comment.
I'm fine either way, I can see the justification for leaving them in because they should work but they don't because of currently unresolved bugs and limitations.
There was a problem hiding this comment.
I prefer to let them since they are supposed to be used and will potentially to be used in future but aren't due to bugs and limitations.
In particular if you look at the top of this file you can see a lengthy explanation of why there is currently no "full" revision (spoiler: ICE messed up things).
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 10, 2024
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#118391 (Add `REDUNDANT_LIFETIMES` lint to detect lifetimes which are semantically redundant) - rust-lang#123534 (Windows: set main thread name without re-encoding) - rust-lang#123659 (Add support to intrinsics fallback body) - rust-lang#123689 (Add const generics support for pattern types) - rust-lang#123701 (Only assert for child/parent projection compatibility AFTER checking that theyre coming from the same place) - rust-lang#123702 (Further cleanup cfgs in the UI test suite) - rust-lang#123706 (rustdoc: reduce per-page HTML overhead) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 10, 2024
Rollup merge of rust-lang#123702 - Urgau:prep-work-for-compiletest-check-cfg-2, r=jieyouxu Further cleanup cfgs in the UI test suite This PR does more cleanup of cfgs in our UI test suite, in preparation for adding automatic always on check-cfg (but is IMO worth landing even without that follow up). To be more specific this PR: - replaces (the last remaining) never true cfgs by the `FALSE` cfg - fix `proc-macro/derive-helper-configured.rs` *(typo in directive)* - and comment some current unused `#[cfg_attr]` *(missing revisions)* Follow-up to rust-lang#123577.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 25, 2024
…youxu
Enable `--check-cfg` by default in UI tests
This PR enables-by-default `--check-cfg` in UI tests, now that it has become stable.
To do so this PR does 2 main things:
- it introduce the `no-auto-check-cfg` directive to `compiletest`, to prevent any `--check-cfg` args (only to be used for `--check-cfg` tests)
- it updates the _remaining_[^1] UI tests by either:
- allowing the lint when neither expecting the lint nor giving the check-cfg args make sense
- give the appropriate check-cfg args
- or expect the lint, when it useful
[^1]: some preparation work was done in rust-lang#123577 rust-lang#123702
I highly recommend reviewing this PR commit-by-commit.
r? `@jieyouxu`
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 2, 2024
…youxu
Enable `--check-cfg` by default in UI tests
This PR enables-by-default `--check-cfg` in UI tests, now that it has become stable.
To do so this PR does 2 main things:
- it introduce the `no-auto-check-cfg` directive to `compiletest`, to prevent any `--check-cfg` args (only to be used for `--check-cfg` tests)
- it updates the _remaining_[^1] UI tests by either:
- allowing the lint when neither expecting the lint nor giving the check-cfg args make sense
- give the appropriate check-cfg args
- or expect the lint, when it useful
[^1]: some preparation work was done in rust-lang#123577 rust-lang#123702
I highly recommend reviewing this PR commit-by-commit.
r? `@jieyouxu`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 2, 2024
…youxu
Enable `--check-cfg` by default in UI tests
This PR enables-by-default `--check-cfg` in UI tests, now that it has become stable.
To do so this PR does 2 main things:
- it introduce the `no-auto-check-cfg` directive to `compiletest`, to prevent any `--check-cfg` args (only to be used for `--check-cfg` tests)
- it updates the _remaining_[^1] UI tests by either:
- allowing the lint when neither expecting the lint nor giving the check-cfg args make sense
- give the appropriate check-cfg args
- or expect the lint, when it useful
[^1]: some preparation work was done in rust-lang#123577 rust-lang#123702
I highly recommend reviewing this PR commit-by-commit.
r? `@jieyouxu`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 4, 2024
Enable `--check-cfg` by default in UI tests
This PR enables-by-default `--check-cfg` in UI tests, now that it has become stable.
To do so this PR does 2 main things:
- it introduce the `no-auto-check-cfg` directive to `compiletest`, to prevent any `--check-cfg` args (only to be used for `--check-cfg` tests)
- it updates the _remaining_[^1] UI tests by either:
- allowing the lint when neither expecting the lint nor giving the check-cfg args make sense
- give the appropriate check-cfg args
- or expect the lint, when it useful
[^1]: some preparation work was done in rust-lang#123577 rust-lang#123702
I highly recommend reviewing this PR commit-by-commit.
r? `@jieyouxu`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 4, 2024
Enable `--check-cfg` by default in UI tests
This PR enables-by-default `--check-cfg` in UI tests, now that it has become stable.
To do so this PR does 2 main things:
- it introduce the `no-auto-check-cfg` directive to `compiletest`, to prevent any `--check-cfg` args (only to be used for `--check-cfg` tests)
- it updates the _remaining_[^1] UI tests by either:
- allowing the lint when neither expecting the lint nor giving the check-cfg args make sense
- give the appropriate check-cfg args
- or expect the lint, when it useful
[^1]: some preparation work was done in rust-lang#123577 rust-lang#123702
I highly recommend reviewing this PR commit-by-commit.
r? `@jieyouxu`
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 does more cleanup of cfgs in our UI test suite, in preparation for adding automatic always on check-cfg (but is IMO worth landing even without that follow up).
To be more specific this PR:
FALSEcfgproc-macro/derive-helper-configured.rs(typo in directive)#[cfg_attr](missing revisions)Follow-up to #123577.