diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76aa79dd3..c732b23fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,8 @@ jobs: CARGO_PROFILE_TEST_DEBUG: 1 CARGO_INCREMENTAL: 0 CARGO_PUBLIC_NETWORK_TESTS: 1 + # Deny warnings on CI to avoid warnings getting into the codebase. + RUSTFLAGS: -D warnings strategy: matrix: include: @@ -85,8 +87,7 @@ jobs: run: echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV if: "!contains(matrix.rust, 'stable')" - # Deny warnings on CI to avoid warnings getting into the codebase. - - run: cargo test --features 'deny-warnings' + - run: cargo test # The testsuite generates a huge amount of data, and fetch-smoke-test was # running out of disk space. - name: Clear test output @@ -100,8 +101,8 @@ jobs: run: | # This only tests `cargo fix` because fix-proxy-mode is one of the most # complicated subprocess management in Cargo. - cargo test --test testsuite --features 'deny-warnings' -- fix:: - - run: cargo test --features 'deny-warnings' --manifest-path crates/cargo-test-support/Cargo.toml + cargo test --test testsuite -- fix:: + - run: cargo test --manifest-path crates/cargo-test-support/Cargo.toml env: CARGO_TARGET_DIR: target - run: cargo test -p cargo-platform diff --git a/Cargo.toml b/Cargo.toml index 9b96a7533..56a65f39c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -112,7 +112,6 @@ test = false doc = false [features] -deny-warnings = [] vendored-openssl = ["openssl/vendored"] vendored-libgit2 = ["libgit2-sys/vendored"] pretty-env-logger = ["pretty_env_logger"] diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 89eb94a5e..5a87ee0be 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -30,6 +30,3 @@ url = "2.2.2" [target.'cfg(windows)'.dependencies] windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem"] } - -[features] -deny-warnings = [] diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index c8936c3e1..64efa03a9 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -3,7 +3,6 @@ //! See for a guide on writing tests. #![allow(clippy::all)] -#![cfg_attr(feature = "deny-warnings", deny(warnings))] use std::env; use std::ffi::OsStr; diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 59b197870..435d582a3 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -1,7 +1,6 @@ // For various reasons, some idioms are still allow'ed, but we would like to // test and enforce them. #![warn(rust_2018_idioms)] -#![cfg_attr(feature = "deny-warnings", deny(warnings))] // Due to some of the default clippy lints being somewhat subjective and not // necessarily an improvement, we prefer to not use them at this time. #![allow(clippy::all)] diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index 76d3f22da..66914e4df 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -1,7 +1,6 @@ // See src/cargo/lib.rs for notes on these lint settings. #![warn(rust_2018_idioms)] #![allow(clippy::all)] -#![cfg_attr(feature = "deny-warnings", deny(warnings))] #[macro_use] extern crate cargo_test_macro;