Fix new nightly clippy issues (#1604)

* clipy

* revert some fixes that newest clippy reports as issues, but older does not

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

@@ -423,7 +423,7 @@ parameter_types! {
 	///
 	/// Assuming the worst case of every header being finalized, we will keep headers at least for a
 	/// week.
-	pub const HeadersToKeep: u32 = 7 * bp_rialto::DAYS as u32;
+	pub const HeadersToKeep: u32 = 7 * bp_rialto::DAYS;
 }
 
 parameter_types! {

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

@@ -416,7 +416,7 @@ parameter_types! {
 	///
 	/// Assuming the worst case of every header being finalized, we will keep headers at least for a
 	/// week.
-	pub const HeadersToKeep: u32 = 7 * bp_rialto::DAYS as u32;
+	pub const HeadersToKeep: u32 = 7 * bp_rialto::DAYS;
 
 	/// Maximal number of authorities at Millau.
 	pub const MaxAuthoritiesAtMillau: u32 = bp_millau::MAX_AUTHORITIES_COUNT;

bridges/primitives/messages/src/lib.rs

@@ -414,7 +414,7 @@ mod tests {
 			.len();
 			let difference = (expected_size.unwrap() as f64 - actual_size as f64).abs();
 			assert!(
-				difference / (std::cmp::min(actual_size, expected_size.unwrap() as usize) as f64) < 0.1,
+				difference / (std::cmp::min(actual_size, expected_size.unwrap()) as f64) < 0.1,
 				"Too large difference between actual ({}) and expected ({:?}) inbound lane data size. Test case: {}+{}",
 				actual_size,
 				expected_size,

bridges/primitives/test-utils/src/lib.rs

@@ -112,7 +112,7 @@ pub fn make_justification_for_header<H: HeaderT>(
 		};
 
 		// Note: Adding 1 to account for the target header
-		let chain = generate_chain(i as u32, depth + 1, &header);
+		let chain = generate_chain(i, depth + 1, &header);
 
 		// We don't include our finality target header in the vote ancestries
 		for child in &chain[1..] {

bridges/relays/finality/src/sync_loop_metrics.rs

@@ -72,7 +72,7 @@ impl SyncLoopMetrics {
 
 	/// Update using-same-fork flag.
 	pub fn update_using_same_fork(&self, using_same_fork: bool) {
-		self.using_different_forks.set(if using_same_fork { 0 } else { 1 })
+		self.using_different_forks.set((!using_same_fork).into())
 	}
 }
 

bridges/relays/messages/src/relay_strategy/mod.rs

@@ -144,7 +144,7 @@ impl<
 					(self.hard_selected_begin_nonce + self.index as MessageNonce),
 				self.selected_prepaid_nonces,
 				self.selected_unpaid_weight,
-				self.selected_size as u32,
+				self.selected_size,
 			)
 			.await?;