diff --git a/tests/ui/mismatched_target_os_non_unix.fixed b/tests/ui/mismatched_target_os_non_unix.fixed new file mode 100644 index 00000000000..3ee77dcac31 --- /dev/null +++ b/tests/ui/mismatched_target_os_non_unix.fixed @@ -0,0 +1,30 @@ +// run-rustfix + +#![warn(clippy::mismatched_target_os)] +#![allow(unused)] + +#[cfg(target_os = "cloudabi")] +fn cloudabi() {} + +#[cfg(target_os = "hermit")] +fn hermit() {} + +#[cfg(target_os = "wasi")] +fn wasi() {} + +#[cfg(target_os = "none")] +fn none() {} + +// list with conditions +#[cfg(all(not(any(windows, target_os = "cloudabi")), target_os = "wasi"))] +fn list() {} + +// windows is a valid target family, should be ignored +#[cfg(windows)] +fn windows() {} + +// correct use, should be ignored +#[cfg(target_os = "hermit")] +fn correct() {} + +fn main() {} diff --git a/tests/ui/mismatched_target_os_non_unix.rs b/tests/ui/mismatched_target_os_non_unix.rs new file mode 100644 index 00000000000..9cc411418e4 --- /dev/null +++ b/tests/ui/mismatched_target_os_non_unix.rs @@ -0,0 +1,30 @@ +// run-rustfix + +#![warn(clippy::mismatched_target_os)] +#![allow(unused)] + +#[cfg(cloudabi)] +fn cloudabi() {} + +#[cfg(hermit)] +fn hermit() {} + +#[cfg(wasi)] +fn wasi() {} + +#[cfg(none)] +fn none() {} + +// list with conditions +#[cfg(all(not(any(windows, cloudabi)), wasi))] +fn list() {} + +// windows is a valid target family, should be ignored +#[cfg(windows)] +fn windows() {} + +// correct use, should be ignored +#[cfg(target_os = "hermit")] +fn correct() {} + +fn main() {} diff --git a/tests/ui/mismatched_target_os_non_unix.stderr b/tests/ui/mismatched_target_os_non_unix.stderr new file mode 100644 index 00000000000..78fc27752d2 --- /dev/null +++ b/tests/ui/mismatched_target_os_non_unix.stderr @@ -0,0 +1,51 @@ +error: operating system used in target family position + --> $DIR/mismatched_target_os_non_unix.rs:6:1 + | +LL | #[cfg(cloudabi)] + | ^^^^^^--------^^ + | | + | help: try: `target_os = "cloudabi"` + | + = note: `-D clippy::mismatched-target-os` implied by `-D warnings` + +error: operating system used in target family position + --> $DIR/mismatched_target_os_non_unix.rs:9:1 + | +LL | #[cfg(hermit)] + | ^^^^^^------^^ + | | + | help: try: `target_os = "hermit"` + +error: operating system used in target family position + --> $DIR/mismatched_target_os_non_unix.rs:12:1 + | +LL | #[cfg(wasi)] + | ^^^^^^----^^ + | | + | help: try: `target_os = "wasi"` + +error: operating system used in target family position + --> $DIR/mismatched_target_os_non_unix.rs:15:1 + | +LL | #[cfg(none)] + | ^^^^^^----^^ + | | + | help: try: `target_os = "none"` + +error: operating system used in target family position + --> $DIR/mismatched_target_os_non_unix.rs:19:1 + | +LL | #[cfg(all(not(any(windows, cloudabi)), wasi))] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | +help: try + | +LL | #[cfg(all(not(any(windows, target_os = "cloudabi")), wasi))] + | ^^^^^^^^^^^^^^^^^^^^^^ +help: try + | +LL | #[cfg(all(not(any(windows, cloudabi)), target_os = "wasi"))] + | ^^^^^^^^^^^^^^^^^^ + +error: aborting due to 5 previous errors + diff --git a/tests/ui/mismatched_target_os.fixed b/tests/ui/mismatched_target_os_unix.fixed similarity index 68% rename from tests/ui/mismatched_target_os.fixed rename to tests/ui/mismatched_target_os_unix.fixed index 3dfd0a3c575..7d9d406d99d 100644 --- a/tests/ui/mismatched_target_os.fixed +++ b/tests/ui/mismatched_target_os_unix.fixed @@ -3,8 +3,6 @@ #![warn(clippy::mismatched_target_os)] #![allow(unused)] -// unix - #[cfg(target_os = "linux")] fn linux() {} @@ -38,6 +36,12 @@ fn fuchsia() {} #[cfg(target_os = "haiku")] fn haiku() {} +#[cfg(target_os = "illumos")] +fn illumos() {} + +#[cfg(target_os = "l4re")] +fn l4re() {} + #[cfg(target_os = "redox")] fn redox() {} @@ -47,30 +51,12 @@ fn solaris() {} #[cfg(target_os = "vxworks")] fn vxworks() {} -// non-unix - -#[cfg(target_os = "cloudabi")] -fn cloudabi() {} - -#[cfg(target_os = "hermit")] -fn hermit() {} - -#[cfg(target_os = "wasi")] -fn wasi() {} - -#[cfg(target_os = "none")] -fn none() {} - // list with conditions -#[cfg(all(not(any(windows, target_os = "linux")), target_os = "freebsd"))] +#[cfg(all(not(any(target_os = "solaris", target_os = "linux")), target_os = "freebsd"))] fn list() {} -// windows is a valid target family, should be ignored -#[cfg(windows)] -fn windows() {} - // correct use, should be ignored #[cfg(target_os = "freebsd")] -fn freebsd() {} +fn correct() {} fn main() {} diff --git a/tests/ui/mismatched_target_os.rs b/tests/ui/mismatched_target_os_unix.rs similarity index 68% rename from tests/ui/mismatched_target_os.rs rename to tests/ui/mismatched_target_os_unix.rs index 436ed6213eb..c1177f1eedc 100644 --- a/tests/ui/mismatched_target_os.rs +++ b/tests/ui/mismatched_target_os_unix.rs @@ -3,8 +3,6 @@ #![warn(clippy::mismatched_target_os)] #![allow(unused)] -// unix - #[cfg(linux)] fn linux() {} @@ -38,6 +36,12 @@ fn fuchsia() {} #[cfg(haiku)] fn haiku() {} +#[cfg(illumos)] +fn illumos() {} + +#[cfg(l4re)] +fn l4re() {} + #[cfg(redox)] fn redox() {} @@ -47,30 +51,12 @@ fn solaris() {} #[cfg(vxworks)] fn vxworks() {} -// non-unix - -#[cfg(cloudabi)] -fn cloudabi() {} - -#[cfg(hermit)] -fn hermit() {} - -#[cfg(wasi)] -fn wasi() {} - -#[cfg(none)] -fn none() {} - // list with conditions -#[cfg(all(not(any(windows, linux)), freebsd))] +#[cfg(all(not(any(solaris, linux)), freebsd))] fn list() {} -// windows is a valid target family, should be ignored -#[cfg(windows)] -fn windows() {} - // correct use, should be ignored #[cfg(target_os = "freebsd")] -fn freebsd() {} +fn correct() {} fn main() {} diff --git a/tests/ui/mismatched_target_os.stderr b/tests/ui/mismatched_target_os_unix.stderr similarity index 69% rename from tests/ui/mismatched_target_os.stderr rename to tests/ui/mismatched_target_os_unix.stderr index 0771681e628..fe9aeedb59c 100644 --- a/tests/ui/mismatched_target_os.stderr +++ b/tests/ui/mismatched_target_os_unix.stderr @@ -1,5 +1,5 @@ error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:8:1 + --> $DIR/mismatched_target_os_unix.rs:6:1 | LL | #[cfg(linux)] | ^^^^^^-----^^ @@ -10,7 +10,7 @@ LL | #[cfg(linux)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:11:1 + --> $DIR/mismatched_target_os_unix.rs:9:1 | LL | #[cfg(freebsd)] | ^^^^^^-------^^ @@ -20,7 +20,7 @@ LL | #[cfg(freebsd)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:14:1 + --> $DIR/mismatched_target_os_unix.rs:12:1 | LL | #[cfg(dragonfly)] | ^^^^^^---------^^ @@ -30,7 +30,7 @@ LL | #[cfg(dragonfly)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:17:1 + --> $DIR/mismatched_target_os_unix.rs:15:1 | LL | #[cfg(openbsd)] | ^^^^^^-------^^ @@ -40,7 +40,7 @@ LL | #[cfg(openbsd)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:20:1 + --> $DIR/mismatched_target_os_unix.rs:18:1 | LL | #[cfg(netbsd)] | ^^^^^^------^^ @@ -50,7 +50,7 @@ LL | #[cfg(netbsd)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:23:1 + --> $DIR/mismatched_target_os_unix.rs:21:1 | LL | #[cfg(macos)] | ^^^^^^-----^^ @@ -60,7 +60,7 @@ LL | #[cfg(macos)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:26:1 + --> $DIR/mismatched_target_os_unix.rs:24:1 | LL | #[cfg(ios)] | ^^^^^^---^^ @@ -70,7 +70,7 @@ LL | #[cfg(ios)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:29:1 + --> $DIR/mismatched_target_os_unix.rs:27:1 | LL | #[cfg(android)] | ^^^^^^-------^^ @@ -80,7 +80,7 @@ LL | #[cfg(android)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:32:1 + --> $DIR/mismatched_target_os_unix.rs:30:1 | LL | #[cfg(emscripten)] | ^^^^^^----------^^ @@ -90,7 +90,7 @@ LL | #[cfg(emscripten)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:35:1 + --> $DIR/mismatched_target_os_unix.rs:33:1 | LL | #[cfg(fuchsia)] | ^^^^^^-------^^ @@ -100,7 +100,7 @@ LL | #[cfg(fuchsia)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:38:1 + --> $DIR/mismatched_target_os_unix.rs:36:1 | LL | #[cfg(haiku)] | ^^^^^^-----^^ @@ -110,7 +110,27 @@ LL | #[cfg(haiku)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:41:1 + --> $DIR/mismatched_target_os_unix.rs:39:1 + | +LL | #[cfg(illumos)] + | ^^^^^^-------^^ + | | + | help: try: `target_os = "illumos"` + | + = help: Did you mean `unix`? + +error: operating system used in target family position + --> $DIR/mismatched_target_os_unix.rs:42:1 + | +LL | #[cfg(l4re)] + | ^^^^^^----^^ + | | + | help: try: `target_os = "l4re"` + | + = help: Did you mean `unix`? + +error: operating system used in target family position + --> $DIR/mismatched_target_os_unix.rs:45:1 | LL | #[cfg(redox)] | ^^^^^^-----^^ @@ -120,7 +140,7 @@ LL | #[cfg(redox)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:44:1 + --> $DIR/mismatched_target_os_unix.rs:48:1 | LL | #[cfg(solaris)] | ^^^^^^-------^^ @@ -130,7 +150,7 @@ LL | #[cfg(solaris)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:47:1 + --> $DIR/mismatched_target_os_unix.rs:51:1 | LL | #[cfg(vxworks)] | ^^^^^^-------^^ @@ -140,52 +160,24 @@ LL | #[cfg(vxworks)] = help: Did you mean `unix`? error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:52:1 + --> $DIR/mismatched_target_os_unix.rs:55:1 | -LL | #[cfg(cloudabi)] - | ^^^^^^--------^^ - | | - | help: try: `target_os = "cloudabi"` - -error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:55:1 - | -LL | #[cfg(hermit)] - | ^^^^^^------^^ - | | - | help: try: `target_os = "hermit"` - -error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:58:1 - | -LL | #[cfg(wasi)] - | ^^^^^^----^^ - | | - | help: try: `target_os = "wasi"` - -error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:61:1 - | -LL | #[cfg(none)] - | ^^^^^^----^^ - | | - | help: try: `target_os = "none"` - -error: operating system used in target family position - --> $DIR/mismatched_target_os.rs:65:1 - | -LL | #[cfg(all(not(any(windows, linux)), freebsd))] +LL | #[cfg(all(not(any(solaris, linux)), freebsd))] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: Did you mean `unix`? help: try | -LL | #[cfg(all(not(any(windows, target_os = "linux")), freebsd))] +LL | #[cfg(all(not(any(target_os = "solaris", linux)), freebsd))] + | ^^^^^^^^^^^^^^^^^^^^^ +help: try + | +LL | #[cfg(all(not(any(solaris, target_os = "linux")), freebsd))] | ^^^^^^^^^^^^^^^^^^^ help: try | -LL | #[cfg(all(not(any(windows, linux)), target_os = "freebsd"))] +LL | #[cfg(all(not(any(solaris, linux)), target_os = "freebsd"))] | ^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to 19 previous errors +error: aborting due to 17 previous errors