The only upstream change relative to the previous commit is that the various Zcash-specific dependencies have been pulled into a cargo workspace. The dependecies in the workspace use the same commits as the crates we had previously vendored. The patches are necessary to handle the fact that cargo requires that dev dependencies are available even if not used, and we would otherwise need to vendor all the underlying crates.
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From cc5b83510277632852af67d896a27e0cb40f342b Mon Sep 17 00:00:00 2001
|
|
From: Sean Bowe <ewillbefull@gmail.com>
|
|
Date: Wed, 4 Jul 2018 12:45:08 -0600
|
|
Subject: [PATCH 1/2] Start using cargo-clippy for CI.
|
|
|
|
---
|
|
src/lib.rs | 21 ++++++++++-----------
|
|
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/lib.rs b/src/lib.rs
|
|
index fefdae3..c3640c4 100644
|
|
--- a/src/lib.rs
|
|
+++ b/src/lib.rs
|
|
@@ -1,15 +1,14 @@
|
|
// `clippy` is a code linting tool for improving code quality by catching
|
|
-// common mistakes or strange code patterns. If the `clippy` feature is
|
|
-// provided, it is enabled and all compiler warnings are prohibited.
|
|
-#![cfg_attr(feature = "clippy", deny(warnings))]
|
|
-#![cfg_attr(feature = "clippy", feature(plugin))]
|
|
-#![cfg_attr(feature = "clippy", plugin(clippy))]
|
|
-#![cfg_attr(feature = "clippy", allow(inline_always))]
|
|
-#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
|
|
-#![cfg_attr(feature = "clippy", allow(unreadable_literal))]
|
|
-#![cfg_attr(feature = "clippy", allow(many_single_char_names))]
|
|
-#![cfg_attr(feature = "clippy", allow(new_without_default_derive))]
|
|
-#![cfg_attr(feature = "clippy", allow(write_literal))]
|
|
+// common mistakes or strange code patterns. If the `cargo-clippy` feature
|
|
+// is provided, all compiler warnings are prohibited.
|
|
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(inline_always))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(unreadable_literal))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(many_single_char_names))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(new_without_default_derive))]
|
|
+#![cfg_attr(feature = "cargo-clippy", allow(write_literal))]
|
|
+
|
|
// Force public structures to implement Debug
|
|
#![deny(missing_debug_implementations)]
|
|
|
|
--
|
|
2.17.1
|
|
|