Fix updated clippy grumbles (#733)

* Revert "Pin Rust Nightly to 2020-12-17 (#652)"

This reverts commit e54e6f7e3d34c28d698e637f9099162b3c1917e9.

* fix clippy

* clippy again

* more clippy in test code

* and new cargo fmt

* another try

bridges/bin/millau/runtime/src/lib.rs

@@ -23,6 +23,8 @@
 #![allow(clippy::large_enum_variant)]
 // Runtime-generated DecodeLimit::decode_all_With_depth_limit
 #![allow(clippy::unnecessary_mut_passed)]
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]

bridges/bin/rialto/runtime/src/lib.rs

@@ -23,6 +23,8 @@
 #![allow(clippy::large_enum_variant)]
 // Runtime-generated DecodeLimit::decode_all_With_depth_limit
 #![allow(clippy::unnecessary_mut_passed)]
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]

bridges/modules/call-dispatch/src/lib.rs

@@ -394,6 +394,9 @@ where
 
 #[cfg(test)]
 mod tests {
+	// From construct_runtime macro
+	#![allow(clippy::from_over_into)]
+
 	use super::*;
 	use frame_support::{parameter_types, weights::Weight};
 	use frame_system::{EventRecord, Phase};

bridges/modules/currency-exchange/src/lib.rs

@@ -210,6 +210,9 @@ fn prepare_deposit_details<T: Config<I>, I: Instance>(
 
 #[cfg(test)]
 mod tests {
+	// From construct_runtime macro
+	#![allow(clippy::from_over_into)]
+
 	use super::*;
 	use bp_currency_exchange::LockFundsTransaction;
 	use frame_support::{assert_noop, assert_ok, construct_runtime, parameter_types, weights::Weight};

bridges/modules/ethereum-contract/builtin/src/lib.rs

@@ -85,7 +85,7 @@ pub fn from_substrate_block_number(number: BlockNumber) -> Result<U256, Error> {
 
 /// Parse Substrate header.
 pub fn parse_substrate_header(raw_header: &[u8]) -> Result<Header, Error> {
-	let substrate_header = RuntimeHeader::decode(&mut &raw_header[..])
+	let substrate_header = RuntimeHeader::decode(&mut &*raw_header)
 		.map(|header| Header {
 			hash: header.hash(),
 			parent_hash: header.parent_hash,
@@ -100,7 +100,7 @@ pub fn parse_substrate_header(raw_header: &[u8]) -> Result<Header, Error> {
 						}
 					})
 				})
-				.and_then(|log| ConsensusLog::decode(&mut &log[..]).ok())
+				.and_then(|log| ConsensusLog::decode(&mut &*log).ok())
 				.and_then(|log| match log {
 					ConsensusLog::ScheduledChange(scheduled_change) => Some(ValidatorsSetSignal {
 						delay: scheduled_change.delay,
@@ -133,7 +133,7 @@ pub fn verify_substrate_finality_proof(
 	raw_best_set: &[u8],
 	raw_finality_proof: &[u8],
 ) -> Result<(), Error> {
-	let best_set = AuthorityList::decode(&mut &raw_best_set[..])
+	let best_set = AuthorityList::decode(&mut &*raw_best_set)
 		.map_err(Error::BestSetDecode)
 		.and_then(|authorities| VoterSet::new(authorities.into_iter()).ok_or(Error::InvalidBestSet));
 

bridges/modules/ethereum/src/mock.rs

@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
+
 pub use crate::test_utils::{insert_header, validator_utils::*, validators_change_receipt, HeaderBuilder, GAS_LIMIT};
 pub use bp_eth_poa::signatures::secret_to_address;
 

bridges/modules/finality-verifier/src/mock.rs

@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
+
 use crate::pallet::{BridgedHeader, Config};
 use bp_runtime::{BlockNumberOf, Chain};
 use frame_support::{construct_runtime, parameter_types, weights::Weight};

bridges/modules/message-lane/src/mock.rs

@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
+
 use crate::Config;
 
 use bp_message_lane::{

bridges/modules/shift-session-manager/src/lib.rs

@@ -86,6 +86,9 @@ impl<T: Config> Module<T> {
 
 #[cfg(test)]
 mod tests {
+	// From construct_runtime macro
+	#![allow(clippy::from_over_into)]
+
 	use super::*;
 	use frame_support::sp_io::TestExternalities;
 	use frame_support::sp_runtime::{

bridges/modules/substrate/src/mock.rs

@@ -19,6 +19,8 @@
 //! Includes some useful testing types and functions.
 
 #![cfg(test)]
+// From construct_runtime macro
+#![allow(clippy::from_over_into)]
 
 use crate::{BridgedBlockHash, BridgedBlockNumber, BridgedHeader, Config};
 use bp_runtime::Chain;

bridges/primitives/header-chain/src/justification.rs

@@ -48,7 +48,7 @@ pub enum Error {
 pub fn decode_justification_target<Header: HeaderT>(
 	raw_justification: &[u8],
 ) -> Result<(Header::Hash, Header::Number), Error> {
-	GrandpaJustification::<Header>::decode(&mut &raw_justification[..])
+	GrandpaJustification::<Header>::decode(&mut &*raw_justification)
 		.map(|justification| (justification.commit.target_hash, justification.commit.target_number))
 		.map_err(|_| Error::JustificationDecode)
 }
@@ -65,7 +65,7 @@ where
 {
 	// Decode justification first
 	let justification =
-		GrandpaJustification::<Header>::decode(&mut &raw_justification[..]).map_err(|_| Error::JustificationDecode)?;
+		GrandpaJustification::<Header>::decode(&mut &*raw_justification).map_err(|_| Error::JustificationDecode)?;
 
 	// Ensure that it is justification for the expected header
 	if (justification.commit.target_hash, justification.commit.target_number) != finalized_target {

bridges/relays/ethereum-client/src/error.rs

@@ -57,8 +57,7 @@ impl MaybeConnectionError for Error {
 	fn is_connection_error(&self) -> bool {
 		matches!(
 			*self,
-			Error::Request(RequestError::TransportError(_))
+			Error::Request(RequestError::TransportError(_)) | Error::ClientNotSynced(_),
-				| Error::ClientNotSynced(_),
 		)
 	}
 }

bridges/relays/ethereum/src/main.rs

@@ -63,7 +63,6 @@ fn main() {
 			.is_err()
 			{
 				log::error!(target: "bridge", "Unable to get Substrate genesis block for Ethereum sync.");
-				return;
 			};
 		}
 		("sub-to-eth", Some(sub_to_eth_matches)) => {
@@ -78,7 +77,6 @@ fn main() {
 			.is_err()
 			{
 				log::error!(target: "bridge", "Unable to get Substrate genesis block for Substrate sync.");
-				return;
 			};
 		}
 		("eth-deploy-contract", Some(eth_deploy_matches)) => {

bridges/relays/substrate-client/src/error.rs

@@ -61,8 +61,7 @@ impl MaybeConnectionError for Error {
 	fn is_connection_error(&self) -> bool {
 		matches!(
 			*self,
-			Error::Request(RequestError::TransportError(_))
+			Error::Request(RequestError::TransportError(_)) | Error::ClientNotSynced(_)
-				| Error::ClientNotSynced(_)
 		)
 	}
 }