Fix New Clippy Lints (#782)

This PR just fixes some clippy lints introduced in newer Rust versions.

### Test Plan

CI

Author: nlordell

ethcontract-common/src/lib.rs

@@ -19,7 +19,7 @@ pub use web3::types::Address;
 pub use web3::types::H256 as TransactionHash;
 
 /// Information about when a contract instance was deployed
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum DeploymentInformation {
     /// The block at which the contract was deployed

ethcontract-generate/src/generate/common.rs

@@ -231,7 +231,7 @@ fn expand_deployment_information(deployment: Option<DeploymentInformation>) -> T
                 Some(ethcontract::common::DeploymentInformation::TransactionHash([#( #bytes ),*].into()))
             }
         }
-        None => return quote! { None },
+        None => quote! { None },
     }
 }
 

ethcontract-mock/src/details/mod.rs

@@ -114,7 +114,8 @@ impl MockTransport {
 
     pub fn checkpoint(&self) {
         let mut state = self.state.lock().unwrap();
-        for contract in state.contracts.values_mut() {
+        let contracts = state.contracts.values_mut();
+        for contract in contracts {
             contract.checkpoint();
         }
     }

ethcontract-mock/src/test/returns.rs

@@ -15,7 +15,7 @@ async fn returns_default() -> Result {
 
     let instance = AbiTypes::at(&contract.web3(), contract.address);
 
-    let _: () = instance.get_void().call().await?;
+    instance.get_void().call().await?;
     assert_eq!(instance.get_u8().call().await?, 0);
     assert_eq!(instance.abiv_2_struct((1, 2)).call().await?, (0, 0));
     assert_eq!(
@@ -57,7 +57,7 @@ async fn returns_const() -> Result {
 
     let instance = AbiTypes::at(&contract.web3(), contract.address);
 
-    let _: () = instance.get_void().call().await?;
+    instance.get_void().call().await?;
     assert_eq!(instance.get_u8().call().await?, 42);
     assert_eq!(instance.abiv_2_struct((1, 2)).call().await?, (1, 2));
     assert_eq!(
@@ -101,7 +101,7 @@ async fn returns_fn() -> Result {
 
     let instance = AbiTypes::at(&contract.web3(), contract.address);
 
-    let _: () = instance.get_void().call().await?;
+    instance.get_void().call().await?;
     assert_eq!(instance.get_u8().call().await?, 42);
     assert_eq!(instance.abiv_2_struct((1, 2)).call().await?, (1, 2));
     assert_eq!(
@@ -145,7 +145,7 @@ async fn returns_fn_ctx() -> Result {
 
     let instance = AbiTypes::at(&contract.web3(), contract.address);
 
-    let _: () = instance.get_void().call().await?;
+    instance.get_void().call().await?;
     assert_eq!(instance.get_u8().call().await?, 42);
     assert_eq!(instance.abiv_2_struct((1, 2)).call().await?, (1, 2));
     assert_eq!(

ethcontract/src/int.rs

@@ -278,7 +278,7 @@ impl I256 {
 
     /// Convert from a decimal string.
     pub fn from_dec_str(value: &str) -> Result<Self, ParseI256Error> {
-        let (sign, value) = match value.as_bytes().get(0) {
+        let (sign, value) = match value.as_bytes().first() {
             Some(b'+') => (Sign::Positive, &value[1..]),
             Some(b'-') => (Sign::Negative, &value[1..]),
             _ => (Sign::Positive, value),
@@ -293,7 +293,7 @@ impl I256 {
 
     /// Convert from a hexadecimal string.
     pub fn from_hex_str(value: &str) -> Result<Self, ParseI256Error> {
-        let (sign, value) = match value.as_bytes().get(0) {
+        let (sign, value) = match value.as_bytes().first() {
             Some(b'+') => (Sign::Positive, &value[1..]),
             Some(b'-') => (Sign::Negative, &value[1..]),
             _ => (Sign::Positive, value),

ethcontract/src/secret.rs

@@ -42,7 +42,7 @@ impl PrivateKey {
     /// Gets the public address for a given private key.
     pub fn public_address(&self) -> Address {
         let secp = Secp256k1::signing_only();
-        let public_key = PublicKey::from_secret_key(&secp, &*self).serialize_uncompressed();
+        let public_key = PublicKey::from_secret_key(&secp, self).serialize_uncompressed();
 
         // NOTE: An ethereum address is the last 20 bytes of the keccak hash of
         //   the public key. Note that `libsecp256k1` public key is serialized

ethcontract/src/test/transport.rs

@@ -36,8 +36,8 @@ impl Transport for TestTransport {
     }
 
     fn send(&self, id: RequestId, request: Call) -> Self::Out {
-        let mut inner = self.inner.lock().unwrap();
-        match inner.responses.pop_front() {
+        let response = self.inner.lock().unwrap().responses.pop_front();
+        match response {
             Some(response) => future::ok(response),
             None => {
                 println!("Unexpected request (id: {:?}): {:?}", id, request);

ethcontract/src/transaction/gas_price.rs

@@ -3,7 +3,7 @@
 use primitive_types::U256;
 use web3::types::U64;
 
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, Eq, PartialEq)]
 /// Data related to gas price, prepared for populating the transaction object.
 pub struct ResolvedTransactionGasPrice {
     /// Legacy gas price, populated if transaction type is legacy
@@ -18,7 +18,7 @@ pub struct ResolvedTransactionGasPrice {
 }
 
 /// The gas price setting to use.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum GasPrice {
     /// Legacy type of transactions, using single gas price value. Equivalent to sending
     /// eip1559 transaction with max_fee_per_gas = max_priority_fee_per_gas = gas_price

ethcontract/src/transport.rs

@@ -169,8 +169,7 @@ mod tests {
         dyn_transport
             .execute("test", vec![json!(42)])
             .immediate()
-            .err()
-            .expect("failed");
+            .expect_err("failed");
         transport.assert_request("test", &[json!(42)]);
         transport.assert_no_more_requests();
     }