From b9d7d089d98bf63a7b7400d00f46db7f10f7a8b5 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 3 Dec 2020 16:09:20 -0800 Subject: [PATCH] Remove `#![forbid(warnings)]`; reply on Clippy in CI/CD instead. The newest Rust Nightly is getting stricter about `forbid(warnings)` which breaks the build. Use "deny" instead of "forbid". And only deny when running Clippy in CI/CD, so that when hacking on *ring* we don't have to deal with warnings right away; we now only have to deal with them when we're ready to submit a change to be merged. --- build.rs | 18 ------------------ src/lib.rs | 11 +---------- tests/aead_tests.rs | 17 ----------------- tests/agreement_tests.rs | 18 ------------------ tests/digest_tests.rs | 18 ------------------ tests/ecdsa_tests.rs | 18 ------------------ tests/ed25519_tests.rs | 18 ------------------ tests/hkdf_tests.rs | 17 ----------------- tests/hmac_tests.rs | 18 ------------------ tests/pbkdf2_tests.rs | 18 ------------------ tests/quic_tests.rs | 18 ------------------ tests/rsa_tests.rs | 18 ------------------ 12 files changed, 1 insertion(+), 206 deletions(-) diff --git a/build.rs b/build.rs index 9ca8d8669..f2db9a841 100644 --- a/build.rs +++ b/build.rs @@ -19,24 +19,6 @@ // another for the concrete logging implementation). Instead we use `eprintln!` // to log everything to stderr. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - // In the `pregenerate_asm_main()` case we don't want to access (Cargo) // environment variables at all, so avoid `use std::env` here. diff --git a/src/lib.rs b/src/lib.rs index 48a22672e..f099fff03 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -70,16 +70,7 @@ // `#[derive(...)]` uses `trivial_numeric_casts` and `unused_qualifications` // internally. #![deny(missing_docs, unused_qualifications, variant_size_differences)] -#![forbid( - anonymous_parameters, - trivial_casts, - trivial_numeric_casts, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_results, - warnings -)] +#![forbid(unused_results)] #![no_std] #[cfg(feature = "alloc")] diff --git a/tests/aead_tests.rs b/tests/aead_tests.rs index ccc52ff42..75e0e9e92 100644 --- a/tests/aead_tests.rs +++ b/tests/aead_tests.rs @@ -13,23 +13,6 @@ // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #![cfg(any(not(target_arch = "wasm32"), feature = "wasm32_c"))] -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure}; diff --git a/tests/agreement_tests.rs b/tests/agreement_tests.rs index fcdcbb72b..416201537 100644 --- a/tests/agreement_tests.rs +++ b/tests/agreement_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - extern crate alloc; use ring::{agreement, error, rand, test, test_file}; diff --git a/tests/digest_tests.rs b/tests/digest_tests.rs index 1b16bb66e..c275de705 100644 --- a/tests/digest_tests.rs +++ b/tests/digest_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use ring::{digest, test, test_file}; #[cfg(target_arch = "wasm32")] diff --git a/tests/ecdsa_tests.rs b/tests/ecdsa_tests.rs index 4cd9ef4ea..317fdbc93 100644 --- a/tests/ecdsa_tests.rs +++ b/tests/ecdsa_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use ring::{ rand, signature::{self, KeyPair}, diff --git a/tests/ed25519_tests.rs b/tests/ed25519_tests.rs index ff97497b1..059ecdb04 100644 --- a/tests/ed25519_tests.rs +++ b/tests/ed25519_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use ring::{ signature::{self, Ed25519KeyPair, KeyPair}, test, test_file, diff --git a/tests/hkdf_tests.rs b/tests/hkdf_tests.rs index e17968c45..88435a845 100644 --- a/tests/hkdf_tests.rs +++ b/tests/hkdf_tests.rs @@ -12,23 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_results, - variant_size_differences, - warnings -)] - use ring::{digest, error, hkdf, test, test_file}; #[cfg(target_arch = "wasm32")] diff --git a/tests/hmac_tests.rs b/tests/hmac_tests.rs index 9e01714eb..486a90a53 100644 --- a/tests/hmac_tests.rs +++ b/tests/hmac_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use ring::{digest, error, hmac, test, test_file}; #[cfg(target_arch = "wasm32")] diff --git a/tests/pbkdf2_tests.rs b/tests/pbkdf2_tests.rs index 0b0cf94b3..13300fa46 100644 --- a/tests/pbkdf2_tests.rs +++ b/tests/pbkdf2_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use core::num::NonZeroU32; use ring::{digest, error, pbkdf2, test, test_file}; diff --git a/tests/quic_tests.rs b/tests/quic_tests.rs index 3e9689cd5..545d7a76f 100644 --- a/tests/quic_tests.rs +++ b/tests/quic_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - use ring::{aead::quic, test, test_file}; #[test] diff --git a/tests/rsa_tests.rs b/tests/rsa_tests.rs index 03e062e29..2b29b2615 100644 --- a/tests/rsa_tests.rs +++ b/tests/rsa_tests.rs @@ -12,24 +12,6 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![forbid( - anonymous_parameters, - box_pointers, - missing_copy_implementations, - missing_debug_implementations, - missing_docs, - trivial_casts, - trivial_numeric_casts, - unsafe_code, - unstable_features, - unused_extern_crates, - unused_import_braces, - unused_qualifications, - unused_results, - variant_size_differences, - warnings -)] - #[cfg(feature = "alloc")] use ring::{ error,