Consistently refer to a test's revision instead of cfg#121373
Merged
bors merged 3 commits intorust-lang:masterfrom Feb 22, 2024
Merged
Consistently refer to a test's revision instead of cfg#121373bors merged 3 commits intorust-lang:masterfrom
revision instead of cfg#121373bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
|
rustbot has assigned @compiler-errors. Use r? to explicitly pick a reviewer |
rustbot
added
A-testsuite
Member
Author
|
This inconsistency dates all the way back to #32007, when revisions were first implemented. I can't see a good reason for having multiple terms for the same concept. Perhaps |
Member
|
FYI: in #121370 I'm changing all the compiletest directives to use |
Compiletest code sometimes refers to a test's revision as its `cfg`. This results in two different names for the same thing, one of which is ambiguous with other kinds of configuration (such as compiletest's own config). This patch replaces those occurrences of `cfg` with `revision`.
Zalathar
force-pushed
the
test-revision
branch
2 times, most recently
from
cb7cf3d to
544d091
Compare
Member
Author
|
Tweaked a couple of comments to be more forward-looking in light of #121370. |
Contributor
|
r? oli-obk |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 22, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121206 (Top level error handling) - rust-lang#121261 (coverage: Remove `pending_dups` from the span refiner) - rust-lang#121336 (triagebot: add queue notifications) - rust-lang#121373 (Consistently refer to a test's `revision` instead of `cfg`) - rust-lang#121391 (never patterns: Fix liveness analysis in the presence of never patterns) - rust-lang#121392 (Unify dylib loading between proc macros and codegen backends) - rust-lang#121399 (Solaris linker does not support --strip-debug) - rust-lang#121406 (Add a couple tests) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 22, 2024
Rollup merge of rust-lang#121373 - Zalathar:test-revision, r=oli-obk Consistently refer to a test's `revision` instead of `cfg` Compiletest allows a test file to specify multiple “revisions” (`//@ revisions: foo bar`), with each revision running as a separate test, and having the ability to define revision-specific headers (`//`@[foo]` ignore-blah`) and revision-specific code (`#[cfg(foo)]`). The code that implements this feature sometimes uses the term “cfg” instead of “revision”. This results in two confusingly-different names for the same concept, one of which is ambiguous with other kinds of configuration (such as compiletest's own config). This PR replaces those occurrences of `cfg` with `revision`, so that one name is used consistently.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Compiletest allows a test file to specify multiple “revisions” (
//@ revisions: foo bar), with each revision running as a separate test, and having the ability to define revision-specific headers (//@[foo] ignore-blah) and revision-specific code (#[cfg(foo)]).The code that implements this feature sometimes uses the term “cfg” instead of “revision”. This results in two confusingly-different names for the same concept, one of which is ambiguous with other kinds of configuration (such as compiletest's own config).
This PR replaces those occurrences of
cfgwithrevision, so that one name is used consistently.