rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Stabilize checking of cfgs at compile-time: --check-cfg option

Browse Source
This commit is contained in:
Urgau
2024-02-25 14:56:14 +01:00
parent 99d0186b1d
commit 909fcfcb6a
55 changed files with 60 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_session/src/config.rs
View File

@@ -1373,7 +1373,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
opt::flag_s("h", "help", "Display this message"), opt::flag_s("h", "help", "Display this message"),
opt::multi_s("", "cfg", "Configure the compilation environment. opt::multi_s("", "cfg", "Configure the compilation environment.
SPEC supports the syntax `NAME[=\"VALUE\"]`.", "SPEC"), SPEC supports the syntax `NAME[=\"VALUE\"]`.", "SPEC"),
opt::multi("", "check-cfg", "Provide list of valid cfg options for checking", "SPEC"), opt::multi_s("", "check-cfg", "Provide list of expected cfgs for checking", "SPEC"),
opt::multi_s( opt::multi_s(
"L", "L",
"", "",

7
src/librustdoc/doctest.rs
View File

@@ -60,11 +60,8 @@ pub(crate) fn generate_args_file(file_path: &Path, options: &RustdocOptions) ->
for cfg in &options.cfgs { for cfg in &options.cfgs {
content.push(format!("--cfg={cfg}")); content.push(format!("--cfg={cfg}"));
} }
if !options.check_cfgs.is_empty() { for check_cfg in &options.check_cfgs {
content.push("-Zunstable-options".to_string()); content.push(format!("--check-cfg={check_cfg}"));
for check_cfg in &options.check_cfgs {
content.push(format!("--check-cfg={check_cfg}"));
}
} }
for lib_str in &options.lib_strs { for lib_str in &options.lib_strs {

2
src/librustdoc/lib.rs
View File

@@ -242,7 +242,7 @@ fn opts() -> Vec<RustcOptGroup> {
o.optmulti("L", "library-path", "directory to add to crate search path", "DIR") o.optmulti("L", "library-path", "directory to add to crate search path", "DIR")
}), }),
stable("cfg", |o| o.optmulti("", "cfg", "pass a --cfg to rustc", "")), stable("cfg", |o| o.optmulti("", "cfg", "pass a --cfg to rustc", "")),
unstable("check-cfg", |o| o.optmulti("", "check-cfg", "pass a --check-cfg to rustc", "")), stable("check-cfg", |o| o.optmulti("", "check-cfg", "pass a --check-cfg to rustc", "")),
stable("extern", |o| o.optmulti("", "extern", "pass an --extern to rustc", "NAME[=PATH]")), stable("extern", |o| o.optmulti("", "extern", "pass an --extern to rustc", "NAME[=PATH]")),
unstable("extern-html-root-url", |o| { unstable("extern-html-root-url", |o| {
o.optmulti( o.optmulti(

2
tests/rustdoc-ui/check-cfg/check-cfg.rs → tests/rustdoc-ui/check-cfg.rs
View File

@@ -1,5 +1,5 @@
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
/// uniz is nor a builtin nor pass as arguments so is unexpected /// uniz is nor a builtin nor pass as arguments so is unexpected
#[cfg(uniz)] #[cfg(uniz)]

0
tests/rustdoc-ui/check-cfg/check-cfg.stderr → tests/rustdoc-ui/check-cfg.stderr
View File

11
tests/rustdoc-ui/check-cfg/check-cfg-test.stderr
View File

@@ -1,11 +0,0 @@
warning: unexpected `cfg` condition value
--> $DIR/check-cfg-test.rs:9:7
|
LL | #[cfg(feature = "invalid")]
| ^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `feature` are: test
= note: `#[warn(unexpected_cfgs)]` on by default
warning: 1 warning emitted

2
tests/rustdoc-ui/check-cfg/check-cfg-unstable.rs
View File

@@ -1,2 +0,0 @@
//@ check-fail
//@ compile-flags: --check-cfg=cfg()

2
tests/rustdoc-ui/check-cfg/check-cfg-unstable.stderr
View File

@@ -1,2 +0,0 @@
error: the `-Z unstable-options` flag must also be passed to enable the flag `check-cfg`

2
tests/ui/check-cfg/allow-at-crate-level.rs
View File

@@ -1,7 +1,7 @@
// This test check that #![allow(unexpected_cfgs)] works with --cfg // This test check that #![allow(unexpected_cfgs)] works with --cfg
// //
//@ check-pass //@ check-pass
//@ compile-flags: --cfg=unexpected --check-cfg=cfg() -Z unstable-options //@ compile-flags: --cfg=unexpected --check-cfg=cfg()
#![allow(unexpected_cfgs)] #![allow(unexpected_cfgs)]

2
tests/ui/check-cfg/allow-macro-cfg.rs
View File

@@ -1,7 +1,7 @@
// This test check that local #[allow(unexpected_cfgs)] works // This test check that local #[allow(unexpected_cfgs)] works
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[allow(unexpected_cfgs)] #[allow(unexpected_cfgs)]
fn foo() { fn foo() {

2
tests/ui/check-cfg/allow-same-level.rs
View File

@@ -1,7 +1,7 @@
// This test check that #[allow(unexpected_cfgs)] doesn't work if put on the same level // This test check that #[allow(unexpected_cfgs)] doesn't work if put on the same level
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[allow(unexpected_cfgs)] #[allow(unexpected_cfgs)]
#[cfg(FALSE)] #[cfg(FALSE)]

2
tests/ui/check-cfg/allow-top-level.rs
View File

@@ -1,7 +1,7 @@
// This test check that a top-level #![allow(unexpected_cfgs)] works // This test check that a top-level #![allow(unexpected_cfgs)] works
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#![allow(unexpected_cfgs)] #![allow(unexpected_cfgs)]

2
tests/ui/check-cfg/allow-upper-level.rs
View File

@@ -1,7 +1,7 @@
// This test check that #[allow(unexpected_cfgs)] work if put on an upper level // This test check that #[allow(unexpected_cfgs)] work if put on an upper level
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[allow(unexpected_cfgs)] #[allow(unexpected_cfgs)]
mod aa { mod aa {

8
tests/ui/check-cfg/cargo-feature.none.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `serde` warning: unexpected `cfg` condition value: `serde`
--> $DIR/cargo-feature.rs:14:7 --> $DIR/cargo-feature.rs:13:7
| |
LL | #[cfg(feature = "serde")] LL | #[cfg(feature = "serde")]
| ^^^^^^^^^^^^^^^^^ help: remove the condition | ^^^^^^^^^^^^^^^^^ help: remove the condition
@@ -10,7 +10,7 @@ LL | #[cfg(feature = "serde")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: (none) warning: unexpected `cfg` condition value: (none)
--> $DIR/cargo-feature.rs:18:7 --> $DIR/cargo-feature.rs:17:7
| |
LL | #[cfg(feature)] LL | #[cfg(feature)]
| ^^^^^^^ help: remove the condition | ^^^^^^^ help: remove the condition
@@ -20,7 +20,7 @@ LL | #[cfg(feature)]
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `tokio_unstable` warning: unexpected `cfg` condition name: `tokio_unstable`
--> $DIR/cargo-feature.rs:22:7 --> $DIR/cargo-feature.rs:21:7
| |
LL | #[cfg(tokio_unstable)] LL | #[cfg(tokio_unstable)]
| ^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^
@@ -30,7 +30,7 @@ LL | #[cfg(tokio_unstable)]
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `CONFIG_NVME` warning: unexpected `cfg` condition name: `CONFIG_NVME`
--> $DIR/cargo-feature.rs:26:7 --> $DIR/cargo-feature.rs:25:7
| |
LL | #[cfg(CONFIG_NVME = "m")] LL | #[cfg(CONFIG_NVME = "m")]
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^

1
tests/ui/check-cfg/cargo-feature.rs
View File

@@ -5,7 +5,6 @@
//@ check-pass //@ check-pass
//@ revisions: some none //@ revisions: some none
//@ rustc-env:CARGO_CRATE_NAME=foo //@ rustc-env:CARGO_CRATE_NAME=foo
//@ compile-flags: -Z unstable-options
//@ [none]compile-flags: --check-cfg=cfg(feature,values()) //@ [none]compile-flags: --check-cfg=cfg(feature,values())
//@ [some]compile-flags: --check-cfg=cfg(feature,values("bitcode")) //@ [some]compile-flags: --check-cfg=cfg(feature,values("bitcode"))
//@ [some]compile-flags: --check-cfg=cfg(CONFIG_NVME,values("y")) //@ [some]compile-flags: --check-cfg=cfg(CONFIG_NVME,values("y"))

8
tests/ui/check-cfg/cargo-feature.some.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `serde` warning: unexpected `cfg` condition value: `serde`
--> $DIR/cargo-feature.rs:14:7 --> $DIR/cargo-feature.rs:13:7
| |
LL | #[cfg(feature = "serde")] LL | #[cfg(feature = "serde")]
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | #[cfg(feature = "serde")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: (none) warning: unexpected `cfg` condition value: (none)
--> $DIR/cargo-feature.rs:18:7 --> $DIR/cargo-feature.rs:17:7
| |
LL | #[cfg(feature)] LL | #[cfg(feature)]
| ^^^^^^^- help: specify a config value: `= "bitcode"` | ^^^^^^^- help: specify a config value: `= "bitcode"`
@@ -20,7 +20,7 @@ LL | #[cfg(feature)]
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `tokio_unstable` warning: unexpected `cfg` condition name: `tokio_unstable`
--> $DIR/cargo-feature.rs:22:7 --> $DIR/cargo-feature.rs:21:7
| |
LL | #[cfg(tokio_unstable)] LL | #[cfg(tokio_unstable)]
| ^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^
@@ -30,7 +30,7 @@ LL | #[cfg(tokio_unstable)]
= note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg> for more information about checking conditional configuration
warning: unexpected `cfg` condition value: `m` warning: unexpected `cfg` condition value: `m`
--> $DIR/cargo-feature.rs:26:7 --> $DIR/cargo-feature.rs:25:7
| |
LL | #[cfg(CONFIG_NVME = "m")] LL | #[cfg(CONFIG_NVME = "m")]
| ^^^^^^^^^^^^^^--- | ^^^^^^^^^^^^^^---

1
tests/ui/check-cfg/cfg-value-for-cfg-name-duplicate.rs
View File

@@ -2,7 +2,6 @@
// This test checks we won't suggest more than 3 span suggestions for cfg names // This test checks we won't suggest more than 3 span suggestions for cfg names
// //
//@ check-pass //@ check-pass
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(foo,values("value")) --check-cfg=cfg(bar,values("value")) --check-cfg=cfg(bee,values("value")) --check-cfg=cfg(cow,values("value")) //@ compile-flags: --check-cfg=cfg(foo,values("value")) --check-cfg=cfg(bar,values("value")) --check-cfg=cfg(bee,values("value")) --check-cfg=cfg(cow,values("value"))
#[cfg(value)] #[cfg(value)]

2
tests/ui/check-cfg/cfg-value-for-cfg-name-duplicate.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `value` warning: unexpected `cfg` condition name: `value`
--> $DIR/cfg-value-for-cfg-name-duplicate.rs:8:7 --> $DIR/cfg-value-for-cfg-name-duplicate.rs:7:7
| |
LL | #[cfg(value)] LL | #[cfg(value)]
| ^^^^^ | ^^^^^

1
tests/ui/check-cfg/cfg-value-for-cfg-name-multiple.rs
View File

@@ -2,7 +2,6 @@
// This test checks that when a single cfg has a value for user's specified name // This test checks that when a single cfg has a value for user's specified name
// //
//@ check-pass //@ check-pass
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(foo,values("my_value")) --check-cfg=cfg(bar,values("my_value")) //@ compile-flags: --check-cfg=cfg(foo,values("my_value")) --check-cfg=cfg(bar,values("my_value"))
#[cfg(my_value)] #[cfg(my_value)]

2
tests/ui/check-cfg/cfg-value-for-cfg-name-multiple.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `my_value` warning: unexpected `cfg` condition name: `my_value`
--> $DIR/cfg-value-for-cfg-name-multiple.rs:8:7 --> $DIR/cfg-value-for-cfg-name-multiple.rs:7:7
| |
LL | #[cfg(my_value)] LL | #[cfg(my_value)]
| ^^^^^^^^ | ^^^^^^^^

1
tests/ui/check-cfg/cfg-value-for-cfg-name.rs
View File

@@ -3,7 +3,6 @@
// suggest to use `#[cfg(target_os = "linux")]` instead of `#[cfg(linux)]` // suggest to use `#[cfg(target_os = "linux")]` instead of `#[cfg(linux)]`
// //
//@ check-pass //@ check-pass
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg() //@ compile-flags: --check-cfg=cfg()
#[cfg(linux)] #[cfg(linux)]

4
tests/ui/check-cfg/cfg-value-for-cfg-name.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `linux` warning: unexpected `cfg` condition name: `linux`
--> $DIR/cfg-value-for-cfg-name.rs:9:7 --> $DIR/cfg-value-for-cfg-name.rs:8:7
| |
LL | #[cfg(linux)] LL | #[cfg(linux)]
| ^^^^^ help: found config with similar value: `target_os = "linux"` | ^^^^^ help: found config with similar value: `target_os = "linux"`
@@ -10,7 +10,7 @@ LL | #[cfg(linux)]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition name: `linux` warning: unexpected `cfg` condition name: `linux`
--> $DIR/cfg-value-for-cfg-name.rs:14:7 --> $DIR/cfg-value-for-cfg-name.rs:13:7
| |
LL | #[cfg(linux = "os-name")] LL | #[cfg(linux = "os-name")]
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^

2
tests/ui/check-cfg/compact-names.rs
View File

@@ -1,7 +1,7 @@
// This test check that we correctly emit an warning for compact cfg // This test check that we correctly emit an warning for compact cfg
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#![feature(cfg_target_compact)] #![feature(cfg_target_compact)]

2
tests/ui/check-cfg/compact-values.rs
View File

@@ -1,7 +1,7 @@
// This test check that we correctly emit an warning for compact cfg // This test check that we correctly emit an warning for compact cfg
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#![feature(cfg_target_compact)] #![feature(cfg_target_compact)]

1
tests/ui/check-cfg/concat-values.rs
View File

@@ -1,5 +1,4 @@
//@ check-pass //@ check-pass
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(my_cfg,values("foo")) --check-cfg=cfg(my_cfg,values("bar")) //@ compile-flags: --check-cfg=cfg(my_cfg,values("foo")) --check-cfg=cfg(my_cfg,values("bar"))
//@ compile-flags: --check-cfg=cfg(my_cfg,values()) //@ compile-flags: --check-cfg=cfg(my_cfg,values())

4
tests/ui/check-cfg/concat-values.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: (none) warning: unexpected `cfg` condition value: (none)
--> $DIR/concat-values.rs:6:7 --> $DIR/concat-values.rs:5:7
| |
LL | #[cfg(my_cfg)] LL | #[cfg(my_cfg)]
| ^^^^^^ | ^^^^^^
@@ -10,7 +10,7 @@ LL | #[cfg(my_cfg)]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `unk` warning: unexpected `cfg` condition value: `unk`
--> $DIR/concat-values.rs:10:7 --> $DIR/concat-values.rs:9:7
| |
LL | #[cfg(my_cfg = "unk")] LL | #[cfg(my_cfg = "unk")]
| ^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^

2
tests/ui/check-cfg/diagnotics.rs
View File

@@ -2,7 +2,7 @@
//@ revisions: cargo rustc //@ revisions: cargo rustc
//@ [rustc]unset-rustc-env:CARGO_CRATE_NAME //@ [rustc]unset-rustc-env:CARGO_CRATE_NAME
//@ [cargo]rustc-env:CARGO_CRATE_NAME=foo //@ [cargo]rustc-env:CARGO_CRATE_NAME=foo
//@ compile-flags: --check-cfg=cfg(feature,values("foo")) --check-cfg=cfg(no_values) -Z unstable-options //@ compile-flags: --check-cfg=cfg(feature,values("foo")) --check-cfg=cfg(no_values)
#[cfg(featur)] #[cfg(featur)]
//~^ WARNING unexpected `cfg` condition name //~^ WARNING unexpected `cfg` condition name

2
tests/ui/check-cfg/empty-values.rs
View File

@@ -1,7 +1,7 @@
// Check that we detect unexpected value when none are allowed // Check that we detect unexpected value when none are allowed
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg(foo,values()) -Zunstable-options //@ compile-flags: --check-cfg=cfg(foo,values())
#[cfg(foo = "foo")] #[cfg(foo = "foo")]
//~^ WARNING unexpected `cfg` condition value //~^ WARNING unexpected `cfg` condition value

8
tests/ui/check-cfg/exhaustive-names-values.empty_cfg.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `unknown_key` warning: unexpected `cfg` condition name: `unknown_key`
--> $DIR/exhaustive-names-values.rs:10:7 --> $DIR/exhaustive-names-values.rs:9:7
| |
LL | #[cfg(unknown_key = "value")] LL | #[cfg(unknown_key = "value")]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | #[cfg(unknown_key = "value")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `value` warning: unexpected `cfg` condition value: `value`
--> $DIR/exhaustive-names-values.rs:14:7 --> $DIR/exhaustive-names-values.rs:13:7
| |
LL | #[cfg(test = "value")] LL | #[cfg(test = "value")]
| ^^^^---------- | ^^^^----------
@@ -21,7 +21,7 @@ LL | #[cfg(test = "value")]
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `feature` warning: unexpected `cfg` condition name: `feature`
--> $DIR/exhaustive-names-values.rs:18:7 --> $DIR/exhaustive-names-values.rs:17:7
| |
LL | #[cfg(feature = "unk")] LL | #[cfg(feature = "unk")]
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
@@ -30,7 +30,7 @@ LL | #[cfg(feature = "unk")]
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition name: `feature` warning: unexpected `cfg` condition name: `feature`
--> $DIR/exhaustive-names-values.rs:25:7 --> $DIR/exhaustive-names-values.rs:24:7
| |
LL | #[cfg(feature = "std")] LL | #[cfg(feature = "std")]
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^

6
tests/ui/check-cfg/exhaustive-names-values.feature.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `unknown_key` warning: unexpected `cfg` condition name: `unknown_key`
--> $DIR/exhaustive-names-values.rs:10:7 --> $DIR/exhaustive-names-values.rs:9:7
| |
LL | #[cfg(unknown_key = "value")] LL | #[cfg(unknown_key = "value")]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | #[cfg(unknown_key = "value")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `value` warning: unexpected `cfg` condition value: `value`
--> $DIR/exhaustive-names-values.rs:14:7 --> $DIR/exhaustive-names-values.rs:13:7
| |
LL | #[cfg(test = "value")] LL | #[cfg(test = "value")]
| ^^^^---------- | ^^^^----------
@@ -21,7 +21,7 @@ LL | #[cfg(test = "value")]
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition value: `unk` warning: unexpected `cfg` condition value: `unk`
--> $DIR/exhaustive-names-values.rs:18:7 --> $DIR/exhaustive-names-values.rs:17:7
| |
LL | #[cfg(feature = "unk")] LL | #[cfg(feature = "unk")]
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^

6
tests/ui/check-cfg/exhaustive-names-values.full.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition name: `unknown_key` warning: unexpected `cfg` condition name: `unknown_key`
--> $DIR/exhaustive-names-values.rs:10:7 --> $DIR/exhaustive-names-values.rs:9:7
| |
LL | #[cfg(unknown_key = "value")] LL | #[cfg(unknown_key = "value")]
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | #[cfg(unknown_key = "value")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `value` warning: unexpected `cfg` condition value: `value`
--> $DIR/exhaustive-names-values.rs:14:7 --> $DIR/exhaustive-names-values.rs:13:7
| |
LL | #[cfg(test = "value")] LL | #[cfg(test = "value")]
| ^^^^---------- | ^^^^----------
@@ -21,7 +21,7 @@ LL | #[cfg(test = "value")]
= note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration
warning: unexpected `cfg` condition value: `unk` warning: unexpected `cfg` condition value: `unk`
--> $DIR/exhaustive-names-values.rs:18:7 --> $DIR/exhaustive-names-values.rs:17:7
| |
LL | #[cfg(feature = "unk")] LL | #[cfg(feature = "unk")]
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^

1
tests/ui/check-cfg/exhaustive-names-values.rs
View File

@@ -2,7 +2,6 @@
// //
//@ check-pass //@ check-pass
//@ revisions: empty_cfg feature full //@ revisions: empty_cfg feature full
//@ compile-flags: -Z unstable-options
//@ [empty_cfg]compile-flags: --check-cfg=cfg() //@ [empty_cfg]compile-flags: --check-cfg=cfg()
//@ [feature]compile-flags: --check-cfg=cfg(feature,values("std")) //@ [feature]compile-flags: --check-cfg=cfg(feature,values("std"))
//@ [full]compile-flags: --check-cfg=cfg(feature,values("std")) --check-cfg=cfg() //@ [full]compile-flags: --check-cfg=cfg(feature,values("std")) --check-cfg=cfg()

2
tests/ui/check-cfg/exhaustive-names.rs
View File

@@ -1,7 +1,7 @@
// Check warning for unexpected cfg // Check warning for unexpected cfg
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[cfg(unknown_key = "value")] #[cfg(unknown_key = "value")]
//~^ WARNING unexpected `cfg` condition name //~^ WARNING unexpected `cfg` condition name

4
tests/ui/check-cfg/exhaustive-values.rs
View File

@@ -2,8 +2,8 @@
// //
//@ check-pass //@ check-pass
//@ revisions: empty_cfg without_names //@ revisions: empty_cfg without_names
//@ [empty_cfg]compile-flags: --check-cfg=cfg() -Z unstable-options //@ [empty_cfg]compile-flags: --check-cfg=cfg()
//@ [without_names]compile-flags: --check-cfg=cfg(any()) -Z unstable-options //@ [without_names]compile-flags: --check-cfg=cfg(any())
#[cfg(test = "value")] #[cfg(test = "value")]
//~^ WARNING unexpected `cfg` condition value //~^ WARNING unexpected `cfg` condition value

1
tests/ui/check-cfg/invalid-arguments.rs
View File

@@ -9,7 +9,6 @@
//@ revisions: mixed_values_any mixed_any any_values giberich unterminated //@ revisions: mixed_values_any mixed_any any_values giberich unterminated
//@ revisions: none_not_empty cfg_none //@ revisions: none_not_empty cfg_none
// //
//@ compile-flags: -Z unstable-options
//@ [anything_else]compile-flags: --check-cfg=anything_else(...) //@ [anything_else]compile-flags: --check-cfg=anything_else(...)
//@ [string_for_name_1]compile-flags: --check-cfg=cfg("NOT_IDENT") //@ [string_for_name_1]compile-flags: --check-cfg=cfg("NOT_IDENT")
//@ [string_for_name_2]compile-flags: --check-cfg=cfg(foo,"NOT_IDENT",bar) //@ [string_for_name_2]compile-flags: --check-cfg=cfg(foo,"NOT_IDENT",bar)

2
tests/ui/check-cfg/mix.rs
View File

@@ -3,7 +3,7 @@
// we correctly lint on the `cfg!` macro and `cfg_attr` attribute. // we correctly lint on the `cfg!` macro and `cfg_attr` attribute.
// //
//@ check-pass //@ check-pass
//@ compile-flags: --cfg feature="bar" --cfg unknown_name -Z unstable-options //@ compile-flags: --cfg feature="bar" --cfg unknown_name
//@ compile-flags: --check-cfg=cfg(feature,values("foo")) //@ compile-flags: --check-cfg=cfg(feature,values("foo"))
#[cfg(windows)] #[cfg(windows)]

4
tests/ui/check-cfg/no-expected-values.empty.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:11:7 --> $DIR/no-expected-values.rs:10:7
| |
LL | #[cfg(feature = "foo")] LL | #[cfg(feature = "foo")]
| ^^^^^^^-------- | ^^^^^^^--------
@@ -12,7 +12,7 @@ LL | #[cfg(feature = "foo")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:15:7 --> $DIR/no-expected-values.rs:14:7
| |
LL | #[cfg(test = "foo")] LL | #[cfg(test = "foo")]
| ^^^^-------- | ^^^^--------

4
tests/ui/check-cfg/no-expected-values.mixed.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:11:7 --> $DIR/no-expected-values.rs:10:7
| |
LL | #[cfg(feature = "foo")] LL | #[cfg(feature = "foo")]
| ^^^^^^^-------- | ^^^^^^^--------
@@ -12,7 +12,7 @@ LL | #[cfg(feature = "foo")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:15:7 --> $DIR/no-expected-values.rs:14:7
| |
LL | #[cfg(test = "foo")] LL | #[cfg(test = "foo")]
| ^^^^-------- | ^^^^--------

1
tests/ui/check-cfg/no-expected-values.rs
View File

@@ -2,7 +2,6 @@
// //
//@ check-pass //@ check-pass
//@ revisions: simple mixed empty //@ revisions: simple mixed empty
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(values,simple,mixed,empty) //@ compile-flags: --check-cfg=cfg(values,simple,mixed,empty)
//@ [simple]compile-flags: --check-cfg=cfg(test) --check-cfg=cfg(feature) //@ [simple]compile-flags: --check-cfg=cfg(test) --check-cfg=cfg(feature)
//@ [mixed]compile-flags: --check-cfg=cfg(test,feature) //@ [mixed]compile-flags: --check-cfg=cfg(test,feature)

4
tests/ui/check-cfg/no-expected-values.simple.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:11:7 --> $DIR/no-expected-values.rs:10:7
| |
LL | #[cfg(feature = "foo")] LL | #[cfg(feature = "foo")]
| ^^^^^^^-------- | ^^^^^^^--------
@@ -12,7 +12,7 @@ LL | #[cfg(feature = "foo")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `foo` warning: unexpected `cfg` condition value: `foo`
--> $DIR/no-expected-values.rs:15:7 --> $DIR/no-expected-values.rs:14:7
| |
LL | #[cfg(test = "foo")] LL | #[cfg(test = "foo")]
| ^^^^-------- | ^^^^--------

2
tests/ui/check-cfg/order-independant.rs
View File

@@ -1,9 +1,7 @@
//@ check-pass //@ check-pass
// //
//@ revisions: values_before values_after //@ revisions: values_before values_after
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(values_before,values_after) //@ compile-flags: --check-cfg=cfg(values_before,values_after)
//
//@ [values_before]compile-flags: --check-cfg=cfg(a,values("b")) --check-cfg=cfg(a) //@ [values_before]compile-flags: --check-cfg=cfg(a,values("b")) --check-cfg=cfg(a)
//@ [values_after]compile-flags: --check-cfg=cfg(a) --check-cfg=cfg(a,values("b")) //@ [values_after]compile-flags: --check-cfg=cfg(a) --check-cfg=cfg(a,values("b"))

2
tests/ui/check-cfg/order-independant.values_after.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `unk` warning: unexpected `cfg` condition value: `unk`
--> $DIR/order-independant.rs:13:7 --> $DIR/order-independant.rs:11:7
| |
LL | #[cfg(a = "unk")] LL | #[cfg(a = "unk")]
| ^^^^^^^^^ | ^^^^^^^^^

2
tests/ui/check-cfg/order-independant.values_before.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `unk` warning: unexpected `cfg` condition value: `unk`
--> $DIR/order-independant.rs:13:7 --> $DIR/order-independant.rs:11:7
| |
LL | #[cfg(a = "unk")] LL | #[cfg(a = "unk")]
| ^^^^^^^^^ | ^^^^^^^^^

2
tests/ui/check-cfg/stmt-no-ice.rs
View File

@@ -1,7 +1,7 @@
// This test checks that there is no ICE with this code // This test checks that there is no ICE with this code
// //
//@ check-pass //@ check-pass
//@ compile-flags:--check-cfg=cfg() -Z unstable-options //@ compile-flags:--check-cfg=cfg()
fn main() { fn main() {
#[cfg(crossbeam_loom)] #[cfg(crossbeam_loom)]

2
tests/ui/check-cfg/unexpected-cfg-name.rs
View File

@@ -1,7 +1,7 @@
// Check warning for unexpected configuration name // Check warning for unexpected configuration name
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[cfg(widnows)] #[cfg(widnows)]
//~^ WARNING unexpected `cfg` condition name //~^ WARNING unexpected `cfg` condition name

2
tests/ui/check-cfg/unexpected-cfg-value.rs
View File

@@ -1,7 +1,7 @@
// Check for unexpected configuration value in the code. // Check for unexpected configuration value in the code.
// //
//@ check-pass //@ check-pass
//@ compile-flags: --cfg=feature="rand" -Z unstable-options //@ compile-flags: --cfg=feature="rand"
//@ compile-flags: --check-cfg=cfg(feature,values("serde","full")) //@ compile-flags: --check-cfg=cfg(feature,values("serde","full"))
#[cfg(feature = "sedre")] #[cfg(feature = "sedre")]

1
tests/ui/check-cfg/unknown-values.rs
View File

@@ -2,7 +2,6 @@
// //
//@ check-pass //@ check-pass
//@ revisions: simple mixed with_values //@ revisions: simple mixed with_values
//@ compile-flags: -Z unstable-options
//@ compile-flags: --check-cfg=cfg(simple,mixed,with_values) //@ compile-flags: --check-cfg=cfg(simple,mixed,with_values)
//@ [simple]compile-flags: --check-cfg=cfg(foo,values(any())) //@ [simple]compile-flags: --check-cfg=cfg(foo,values(any()))
//@ [mixed]compile-flags: --check-cfg=cfg(foo) --check-cfg=cfg(foo,values(any())) //@ [mixed]compile-flags: --check-cfg=cfg(foo) --check-cfg=cfg(foo,values(any()))

4
tests/ui/check-cfg/values-none.explicit.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `too` warning: unexpected `cfg` condition value: `too`
--> $DIR/values-none.rs:11:7 --> $DIR/values-none.rs:10:7
| |
LL | #[cfg(foo = "too")] LL | #[cfg(foo = "too")]
| ^^^-------- | ^^^--------
@@ -12,7 +12,7 @@ LL | #[cfg(foo = "too")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `bar` warning: unexpected `cfg` condition value: `bar`
--> $DIR/values-none.rs:16:7 --> $DIR/values-none.rs:15:7
| |
LL | #[cfg(foo = "bar")] LL | #[cfg(foo = "bar")]
| ^^^-------- | ^^^--------

4
tests/ui/check-cfg/values-none.implicit.stderr
View File

@@ -1,5 +1,5 @@
warning: unexpected `cfg` condition value: `too` warning: unexpected `cfg` condition value: `too`
--> $DIR/values-none.rs:11:7 --> $DIR/values-none.rs:10:7
| |
LL | #[cfg(foo = "too")] LL | #[cfg(foo = "too")]
| ^^^-------- | ^^^--------
@@ -12,7 +12,7 @@ LL | #[cfg(foo = "too")]
= note: `#[warn(unexpected_cfgs)]` on by default = note: `#[warn(unexpected_cfgs)]` on by default
warning: unexpected `cfg` condition value: `bar` warning: unexpected `cfg` condition value: `bar`
--> $DIR/values-none.rs:16:7 --> $DIR/values-none.rs:15:7
| |
LL | #[cfg(foo = "bar")] LL | #[cfg(foo = "bar")]
| ^^^-------- | ^^^--------

1
tests/ui/check-cfg/values-none.rs
View File

@@ -1,7 +1,6 @@
//@ check-pass //@ check-pass
// //
//@ revisions: explicit implicit //@ revisions: explicit implicit
//@ compile-flags: -Zunstable-options
//@ [explicit]compile-flags: --check-cfg=cfg(foo,values(none())) //@ [explicit]compile-flags: --check-cfg=cfg(foo,values(none()))
//@ [implicit]compile-flags: --check-cfg=cfg(foo) //@ [implicit]compile-flags: --check-cfg=cfg(foo)
//@ [simple] compile-flags: --check-cfg=cfg(foo,values(none(),"too")) //@ [simple] compile-flags: --check-cfg=cfg(foo,values(none(),"too"))

2
tests/ui/check-cfg/values-target-json.rs
View File

@@ -2,7 +2,7 @@
// //
//@ check-pass //@ check-pass
//@ needs-llvm-components: x86 //@ needs-llvm-components: x86
//@ compile-flags: --crate-type=lib --check-cfg=cfg() --target={{src-base}}/check-cfg/my-awesome-platform.json -Z unstable-options //@ compile-flags: --crate-type=lib --check-cfg=cfg() --target={{src-base}}/check-cfg/my-awesome-platform.json
#![feature(lang_items, no_core, auto_traits)] #![feature(lang_items, no_core, auto_traits)]
#![no_core] #![no_core]

2
tests/ui/check-cfg/well-known-names.rs
View File

@@ -1,7 +1,7 @@
// This test checks that we lint on non well known names and that we don't lint on well known names // This test checks that we lint on non well known names and that we don't lint on well known names
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
#[cfg(target_oz = "linux")] #[cfg(target_oz = "linux")]
//~^ WARNING unexpected `cfg` condition name //~^ WARNING unexpected `cfg` condition name

2
tests/ui/check-cfg/well-known-values.rs
View File

@@ -5,7 +5,7 @@
// values since the suggestion shows them. // values since the suggestion shows them.
// //
//@ check-pass //@ check-pass
//@ compile-flags: --check-cfg=cfg() -Z unstable-options //@ compile-flags: --check-cfg=cfg()
//@ compile-flags: -Zcheck-cfg-all-expected //@ compile-flags: -Zcheck-cfg-all-expected
#![feature(cfg_overflow_checks)] #![feature(cfg_overflow_checks)]

3
tests/ui/feature-gates/feature-gate-check-cfg.rs
View File

@@ -1,3 +0,0 @@
//@ compile-flags: --check-cfg "cfg()"
fn main() {}

2
tests/ui/feature-gates/feature-gate-check-cfg.stderr
View File

@@ -1,2 +0,0 @@
error: the `-Z unstable-options` flag must also be passed to enable the flag `check-cfg`