Skip to content

Commit 7dd170f

Browse files
borsbors
committed
Auto merge of rust-lang#124345 - Urgau:compiletest-check-cfg, r=jieyouxu
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`
2 parents 6d721dd + d4e26fb commit 7dd170f

File tree

110 files changed

+302
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+302
-220
lines changed

‎src/tools/compiletest/src/header.rs

+7
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ pub struct TestProps {
208208
pub llvm_cov_flags: Vec<String>,
209209
/// Extra flags to pass to LLVM's `filecheck` tool, in tests that use it.
210210
pub filecheck_flags: Vec<String>,
211+
/// Don't automatically insert any `--check-cfg` args
212+
pub no_auto_check_cfg: bool,
211213
}
212214

213215
mod directives {
@@ -249,6 +251,7 @@ mod directives {
249251
pub const COMPARE_OUTPUT_LINES_BY_SUBSET: &'static str = "compare-output-lines-by-subset";
250252
pub const LLVM_COV_FLAGS: &'static str = "llvm-cov-flags";
251253
pub const FILECHECK_FLAGS: &'static str = "filecheck-flags";
254+
pub const NO_AUTO_CHECK_CFG: &'static str = "no-auto-check-cfg";
252255
// This isn't a real directive, just one that is probably mistyped often
253256
pub const INCORRECT_COMPILER_FLAGS: &'static str = "compiler-flags";
254257
}
@@ -304,6 +307,7 @@ impl TestProps {
304307
remap_src_base: false,
305308
llvm_cov_flags: vec![],
306309
filecheck_flags: vec![],
310+
no_auto_check_cfg: false,
307311
}
308312
}
309313

@@ -567,6 +571,8 @@ impl TestProps {
567571
if let Some(flags) = config.parse_name_value_directive(ln, FILECHECK_FLAGS) {
568572
self.filecheck_flags.extend(split_flags(&flags));
569573
}
574+
575+
config.set_name_directive(ln, NO_AUTO_CHECK_CFG, &mut self.no_auto_check_cfg);
570576
},
571577
);
572578

@@ -860,6 +866,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
860866
"needs-unwind",
861867
"needs-wasmtime",
862868
"needs-xray",
869+
"no-auto-check-cfg",
863870
"no-prefer-dynamic",
864871
"normalize-stderr-32bit",
865872
"normalize-stderr-64bit",

‎src/tools/compiletest/src/runtest.rs

+22-3
Original file line numberDiff line numberDiff line change
@@ -1028,12 +1028,31 @@ impl<'test> TestCx<'test> {
10281028
}
10291029

10301030
fn set_revision_flags(&self, cmd: &mut Command) {
1031+
// Normalize revisions to be lowercase and replace `-`s with `_`s.
1032+
// Otherwise the `--cfg` flag is not valid.
1033+
let normalize_revision = |revision: &str| revision.to_lowercase().replace("-", "_");
1034+
10311035
if let Some(revision) = self.revision {
1032-
// Normalize revisions to be lowercase and replace `-`s with `_`s.
1033-
// Otherwise the `--cfg` flag is not valid.
1034-
let normalized_revision = revision.to_lowercase().replace("-", "_");
1036+
let normalized_revision = normalize_revision(revision);
10351037
cmd.args(&["--cfg", &normalized_revision]);
10361038
}
1039+
1040+
if !self.props.no_auto_check_cfg {
1041+
let mut check_cfg = String::with_capacity(25);
1042+
1043+
// Generate `cfg(FALSE, REV1, ..., REVN)` (for all possible revisions)
1044+
//
1045+
// For compatibility reason we consider the `FALSE` cfg to be expected
1046+
// since it is extensively used in the testsuite.
1047+
check_cfg.push_str("cfg(FALSE");
1048+
for revision in &self.props.revisions {
1049+
check_cfg.push_str(",");
1050+
check_cfg.push_str(&normalize_revision(&revision));
1051+
}
1052+
check_cfg.push_str(")");
1053+
1054+
cmd.args(&["--check-cfg", &check_cfg]);
1055+
}
10371056
}
10381057

10391058
fn typecheck_source(&self, src: String) -> ProcRes {

‎tests/codegen/instrument-coverage/instrument-coverage-off.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
// Test that `-Cinstrument-coverage=off` does not add coverage instrumentation to LLVM IR.
22

3-
//@ needs-profiler-support
4-
//@ revisions: n no off false zero
3+
//@ revisions: n no off false_ zero
54
//@ [n] compile-flags: -Cinstrument-coverage=n
65
//@ [no] compile-flags: -Cinstrument-coverage=no
76
//@ [off] compile-flags: -Cinstrument-coverage=off
8-
//@ [false] compile-flags: -Cinstrument-coverage=false
7+
//@ [false_] compile-flags: -Cinstrument-coverage=false
98
//@ [zero] compile-flags: -Cinstrument-coverage=0
109

1110
// CHECK-NOT: __llvm_profile_filename
1211
// CHECK-NOT: __llvm_coverage_mapping
1312

14-
#![crate_type="lib"]
13+
#![crate_type = "lib"]
1514

1615
#[inline(never)]
17-
fn some_function() {
18-
19-
}
16+
fn some_function() {}
2017

2118
pub fn some_other_function() {
2219
some_function();

‎tests/codegen/instrument-coverage/instrument-coverage.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Test that `-Cinstrument-coverage` creates expected __llvm_profile_filename symbol in LLVM IR.
22

33
//@ needs-profiler-support
4-
//@ revisions: default y yes on true all
4+
//@ revisions: default y yes on true_ all
55
//@ [default] compile-flags: -Cinstrument-coverage
66
//@ [y] compile-flags: -Cinstrument-coverage=y
77
//@ [yes] compile-flags: -Cinstrument-coverage=yes
88
//@ [on] compile-flags: -Cinstrument-coverage=on
9-
//@ [true] compile-flags: -Cinstrument-coverage=true
9+
//@ [true_] compile-flags: -Cinstrument-coverage=true
1010
//@ [all] compile-flags: -Cinstrument-coverage=all
1111

1212
// CHECK: @__llvm_profile_filename = {{.*}}"default_%m_%p.profraw\00"{{.*}}

‎tests/rustdoc-ui/argfile/commandline-argfile.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
33
//@ check-pass
4-
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile.args
4+
//@ compile-flags: --cfg cmdline_set --check-cfg=cfg(cmdline_set,unbroken)
5+
//@ compile-flags: @{{src-base}}/argfile/commandline-argfile.args
56

67
#[cfg(not(cmdline_set))]
78
compile_error!("cmdline_set not set");
89

910
#[cfg(not(unbroken))]
1011
compile_error!("unbroken not set");
1112

12-
fn main() {
13-
}
13+
fn main() {}

‎tests/ui/argfile/commandline-argfile.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
33
//@ build-pass
4-
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile.args
4+
//@ compile-flags: --cfg cmdline_set --check-cfg=cfg(cmdline_set,unbroken)
5+
//@ compile-flags: @{{src-base}}/argfile/commandline-argfile.args
56

67
#[cfg(not(cmdline_set))]
78
compile_error!("cmdline_set not set");
89

910
#[cfg(not(unbroken))]
1011
compile_error!("unbroken not set");
1112

12-
fn main() {
13-
}
13+
fn main() {}

‎tests/ui/cfg/cfg-in-crate-1.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ run-pass
2-
//@ compile-flags: --cfg bar -D warnings
2+
//@ compile-flags: --cfg bar --check-cfg=cfg(bar) -D warnings
3+
34
#![cfg(bar)]
45

56
fn main() {}

‎tests/ui/cfg/cfg-macros-foo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ run-pass
2-
//@ compile-flags: --cfg foo
2+
//@ compile-flags: --cfg foo --check-cfg=cfg(foo)
33

44
// check that cfg correctly chooses between the macro impls (see also
55
// cfg-macros-notfoo.rs)

‎tests/ui/cfg/cfg-path-error.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//@ check-fail
22

3+
#![allow(unexpected_cfgs)] // invalid cfgs
4+
35
#[cfg(any(foo, foo::bar))]
46
//~^ERROR `cfg` predicate key must be an identifier
57
fn foo1() {}

‎tests/ui/cfg/cfg-path-error.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: `cfg` predicate key must be an identifier
2-
--> $DIR/cfg-path-error.rs:3:16
2+
--> $DIR/cfg-path-error.rs:5:16
33
|
44
LL | #[cfg(any(foo, foo::bar))]
55
| ^^^^^^^^
66

77
error: `cfg` predicate key must be an identifier
8-
--> $DIR/cfg-path-error.rs:7:11
8+
--> $DIR/cfg-path-error.rs:9:11
99
|
1010
LL | #[cfg(any(foo::bar, foo))]
1111
| ^^^^^^^^
1212

1313
error: `cfg` predicate key must be an identifier
14-
--> $DIR/cfg-path-error.rs:11:16
14+
--> $DIR/cfg-path-error.rs:13:16
1515
|
1616
LL | #[cfg(all(foo, foo::bar))]
1717
| ^^^^^^^^
1818

1919
error: `cfg` predicate key must be an identifier
20-
--> $DIR/cfg-path-error.rs:15:11
20+
--> $DIR/cfg-path-error.rs:17:11
2121
|
2222
LL | #[cfg(all(foo::bar, foo))]
2323
| ^^^^^^^^

‎tests/ui/cfg/cfg_attr.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//@ run-pass
22
//@ compile-flags:--cfg set1 --cfg set2
3-
#![allow(dead_code)]
3+
4+
#![allow(dead_code, unexpected_cfgs)]
5+
46
use std::fmt::Debug;
57

68
struct NotDebugable;

‎tests/ui/cfg/cfgs-on-items.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//@ run-pass
2-
//@ compile-flags: --cfg fooA --cfg fooB
2+
//@ compile-flags: --cfg fooA --cfg fooB --check-cfg=cfg(fooA,fooB,fooC,bar)
33

44
// fooA AND !bar
5-
65
#[cfg(all(fooA, not(bar)))]
76
fn foo1() -> isize { 1 }
87

‎tests/ui/cfg/diagnostics-not-a-def.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
#![feature(lint_reasons)]
2+
13
pub mod inner {
4+
#[expect(unexpected_cfgs)]
25
pub fn i_am_here() {
36
#[cfg(feature = "another one that doesn't exist")]
47
loop {}

‎tests/ui/cfg/diagnostics-not-a-def.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0425]: cannot find function `i_am_not` in module `inner`
2-
--> $DIR/diagnostics-not-a-def.rs:11:12
2+
--> $DIR/diagnostics-not-a-def.rs:14:12
33
|
44
LL | inner::i_am_not();
55
| ^^^^^^^^ not found in `inner`

‎tests/ui/cfg/diagnostics-same-crate.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(unexpected_cfgs)] // since we want to recognize them as unexpected
2+
13
pub mod inner {
24
#[cfg(FALSE)]
35
pub fn uwu() {}

‎tests/ui/cfg/diagnostics-same-crate.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
error[E0432]: unresolved import `super::inner::doesnt_exist`
2-
--> $DIR/diagnostics-same-crate.rs:28:9
2+
--> $DIR/diagnostics-same-crate.rs:30:9
33
|
44
LL | use super::inner::doesnt_exist;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ no `doesnt_exist` in `inner`
66
|
77
note: found an item that was configured out
8-
--> $DIR/diagnostics-same-crate.rs:7:13
8+
--> $DIR/diagnostics-same-crate.rs:9:13
99
|
1010
LL | pub mod doesnt_exist {
1111
| ^^^^^^^^^^^^
1212

1313
error[E0432]: unresolved import `super::inner::doesnt_exist`
14-
--> $DIR/diagnostics-same-crate.rs:31:23
14+
--> $DIR/diagnostics-same-crate.rs:33:23
1515
|
1616
LL | use super::inner::doesnt_exist::hi;
1717
| ^^^^^^^^^^^^ could not find `doesnt_exist` in `inner`
1818
|
1919
note: found an item that was configured out
20-
--> $DIR/diagnostics-same-crate.rs:7:13
20+
--> $DIR/diagnostics-same-crate.rs:9:13
2121
|
2222
LL | pub mod doesnt_exist {
2323
| ^^^^^^^^^^^^
2424

2525
error[E0433]: failed to resolve: could not find `doesnt_exist` in `inner`
26-
--> $DIR/diagnostics-same-crate.rs:50:12
26+
--> $DIR/diagnostics-same-crate.rs:52:12
2727
|
2828
LL | inner::doesnt_exist::hello();
2929
| ^^^^^^^^^^^^ could not find `doesnt_exist` in `inner`
3030
|
3131
note: found an item that was configured out
32-
--> $DIR/diagnostics-same-crate.rs:7:13
32+
--> $DIR/diagnostics-same-crate.rs:9:13
3333
|
3434
LL | pub mod doesnt_exist {
3535
| ^^^^^^^^^^^^
3636

3737
error[E0425]: cannot find function `uwu` in module `inner`
38-
--> $DIR/diagnostics-same-crate.rs:45:12
38+
--> $DIR/diagnostics-same-crate.rs:47:12
3939
|
4040
LL | inner::uwu();
4141
| ^^^ not found in `inner`
4242
|
4343
note: found an item that was configured out
44-
--> $DIR/diagnostics-same-crate.rs:3:12
44+
--> $DIR/diagnostics-same-crate.rs:5:12
4545
|
4646
LL | pub fn uwu() {}
4747
| ^^^
4848

4949
error[E0425]: cannot find function `meow` in module `inner::right`
50-
--> $DIR/diagnostics-same-crate.rs:54:19
50+
--> $DIR/diagnostics-same-crate.rs:56:19
5151
|
5252
LL | inner::right::meow();
5353
| ^^^^ not found in `inner::right`
5454
|
5555
note: found an item that was configured out
56-
--> $DIR/diagnostics-same-crate.rs:22:16
56+
--> $DIR/diagnostics-same-crate.rs:24:16
5757
|
5858
LL | pub fn meow() {}
5959
| ^^^^
6060
= note: the item is gated behind the `what-a-cool-feature` feature
6161

6262
error[E0425]: cannot find function `uwu` in this scope
63-
--> $DIR/diagnostics-same-crate.rs:41:5
63+
--> $DIR/diagnostics-same-crate.rs:43:5
6464
|
6565
LL | uwu();
6666
| ^^^ not found in this scope
6767

6868
error[E0425]: cannot find function `vanished` in this scope
69-
--> $DIR/diagnostics-same-crate.rs:61:5
69+
--> $DIR/diagnostics-same-crate.rs:63:5
7070
|
7171
LL | vanished();
7272
| ^^^^^^^^ not found in this scope

‎tests/ui/cfg/expanded-cfg.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//@ check-pass
22

3+
#![allow(unexpected_cfgs)] // since we different cfgs
4+
35
macro_rules! mac {
46
{} => {
57
#[cfg(attr)]

‎tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ check-fail
2-
//@ compile-flags:--cfg foo
2+
//@ compile-flags:--cfg foo --check-cfg=cfg(foo)
33

44
#![cfg_attr(foo, crate_type="bin")]
55
//~^ERROR `crate_type` within

‎tests/ui/check-cfg/allow-at-crate-level.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test check that #![allow(unexpected_cfgs)] works with --cfg
22
//
33
//@ check-pass
4+
//@ no-auto-check-cfg
45
//@ compile-flags: --cfg=unexpected --check-cfg=cfg()
56

67
#![allow(unexpected_cfgs)]

‎tests/ui/check-cfg/allow-macro-cfg.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test check that local #[allow(unexpected_cfgs)] works
22
//
33
//@ check-pass
4+
//@ no-auto-check-cfg
45
//@ compile-flags: --check-cfg=cfg()
56

67
#[allow(unexpected_cfgs)]

‎tests/ui/check-cfg/allow-same-level.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test check that #[allow(unexpected_cfgs)] doesn't work if put on the same level
22
//
33
//@ check-pass
4+
//@ no-auto-check-cfg
45
//@ compile-flags: --check-cfg=cfg()
56

67
#[allow(unexpected_cfgs)]

‎tests/ui/check-cfg/allow-same-level.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: unexpected `cfg` condition name: `FALSE`
2-
--> $DIR/allow-same-level.rs:7:7
2+
--> $DIR/allow-same-level.rs:8:7
33
|
44
LL | #[cfg(FALSE)]
55
| ^^^^^

‎tests/ui/check-cfg/allow-top-level.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test check that a top-level #![allow(unexpected_cfgs)] works
22
//
33
//@ check-pass
4+
//@ no-auto-check-cfg
45
//@ compile-flags: --check-cfg=cfg()
56

67
#![allow(unexpected_cfgs)]

‎tests/ui/check-cfg/allow-upper-level.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test check that #[allow(unexpected_cfgs)] work if put on an upper level
22
//
33
//@ check-pass
4+
//@ no-auto-check-cfg
45
//@ compile-flags: --check-cfg=cfg()
56

67
#[allow(unexpected_cfgs)]

0 commit comments

Comments
 (0)