Skip to content

Improve runtest revision redundant cfg check #152925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 3 commits into from
Feb 21, 2026
Merged

Improve runtest revision redundant cfg check #152925

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd20f16
Always check compile_flags for revision
Hoverbear Feb 20, 2026
7c01112
Fix copy_and_clone.rs
Hoverbear Feb 20, 2026
3c9ca9b
Add reasoning for double iteration
Hoverbear Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,10 @@ impl<'test> TestCx<'test> {
let normalized_revision = normalize_revision(revision);
let cfg_arg = ["--cfg", &normalized_revision];
let arg = format!("--cfg={normalized_revision}");
if self
.props
.compile_flags
.windows(2)
.any(|args| args == cfg_arg || args[0] == arg || args[1] == arg)
{
let contains_arg =
self.props.compile_flags.iter().any(|considered_arg| *considered_arg == arg);
let contains_cfg_arg = self.props.compile_flags.windows(2).any(|args| args == cfg_arg);
if contains_arg || contains_cfg_arg {
error!(
"redundant cfg argument `{normalized_revision}` is already created by the \
revision"
Expand Down
1 change: 0 additions & 1 deletion tests/mir-opt/pre-codegen/copy_and_clone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ [COPY] compile-flags: --cfg=copy
//@ revisions: COPY CLONE

// Test case from https://github.com/rust-lang/rust/issues/128081.
Expand Down
Loading