From 8fb69dcbf0a3f3a00352d5cb534523699651428a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Sun, 8 Sep 2024 19:12:35 +0200 Subject: [PATCH] remove cfg-check in ci tool (#15063) # Objective - Missed in #14477 - This commands is not used anymore ## Solution - Remove it --- tools/ci/src/ci.rs | 3 --- tools/ci/src/commands/cfg_check.rs | 18 ------------------ tools/ci/src/commands/mod.rs | 2 -- 3 files changed, 23 deletions(-) delete mode 100644 tools/ci/src/commands/cfg_check.rs diff --git a/tools/ci/src/ci.rs b/tools/ci/src/ci.rs index 953c2ca459..c02fdfb31c 100644 --- a/tools/ci/src/ci.rs +++ b/tools/ci/src/ci.rs @@ -75,7 +75,6 @@ impl CI { cmds.append(&mut commands::DocCheckCommand::default().prepare(sh, flags)); cmds.append(&mut commands::DocTestCommand::default().prepare(sh, flags)); cmds.append(&mut commands::CompileCheckCommand::default().prepare(sh, flags)); - cmds.append(&mut commands::CfgCheckCommand::default().prepare(sh, flags)); cmds.append(&mut commands::CompileFailCommand::default().prepare(sh, flags)); cmds.append(&mut commands::BenchCheckCommand::default().prepare(sh, flags)); cmds.append(&mut commands::ExampleCheckCommand::default().prepare(sh, flags)); @@ -101,7 +100,6 @@ enum Commands { DocCheck(commands::DocCheckCommand), DocTest(commands::DocTestCommand), CompileCheck(commands::CompileCheckCommand), - CfgCheck(commands::CfgCheckCommand), CompileFail(commands::CompileFailCommand), BenchCheck(commands::BenchCheckCommand), ExampleCheck(commands::ExampleCheckCommand), @@ -121,7 +119,6 @@ impl Prepare for Commands { Commands::DocCheck(subcommand) => subcommand.prepare(sh, flags), Commands::DocTest(subcommand) => subcommand.prepare(sh, flags), Commands::CompileCheck(subcommand) => subcommand.prepare(sh, flags), - Commands::CfgCheck(subcommand) => subcommand.prepare(sh, flags), Commands::CompileFail(subcommand) => subcommand.prepare(sh, flags), Commands::BenchCheck(subcommand) => subcommand.prepare(sh, flags), Commands::ExampleCheck(subcommand) => subcommand.prepare(sh, flags), diff --git a/tools/ci/src/commands/cfg_check.rs b/tools/ci/src/commands/cfg_check.rs deleted file mode 100644 index 057b2fc48d..0000000000 --- a/tools/ci/src/commands/cfg_check.rs +++ /dev/null @@ -1,18 +0,0 @@ -use crate::{Flag, Prepare, PreparedCommand}; -use argh::FromArgs; -use xshell::cmd; - -/// Checks that the project compiles using the nightly compiler with cfg checks enabled. -#[derive(FromArgs, Default)] -#[argh(subcommand, name = "cfg-check")] -pub struct CfgCheckCommand {} - -impl Prepare for CfgCheckCommand { - fn prepare<'a>(&self, sh: &'a xshell::Shell, _flags: Flag) -> Vec> { - vec![PreparedCommand::new::( - cmd!(sh, "cargo +nightly check -Zcheck-cfg --workspace"), - "Please fix failing cfg checks in output above.", - ) - .with_env_var("RUSTFLAGS", "-D warnings")] - } -} diff --git a/tools/ci/src/commands/mod.rs b/tools/ci/src/commands/mod.rs index 6b8cba6bf6..9c9f19e01a 100644 --- a/tools/ci/src/commands/mod.rs +++ b/tools/ci/src/commands/mod.rs @@ -1,5 +1,4 @@ pub use bench_check::*; -pub use cfg_check::*; pub use clippy::*; pub use compile::*; pub use compile_check::*; @@ -14,7 +13,6 @@ pub use test::*; pub use test_check::*; mod bench_check; -mod cfg_check; mod clippy; mod compile; mod compile_check;