Bump rust-toolchain to 1.63 and fix new warnings. (#579)

anorth · vyzo · mriise · web-flow · commit b206906254ca · 2022-08-25T12:32:04.000+10:00
most changes is just adding `Eq` to derive, only others was avoiding reborrows and allowing a 'complex' type change .err.expect to .expect_err, and dont bind to a unit value Cherry-picked from b0c8671 on the `next` branch. Co-authored-by: mriise <me@mriise.net> Co-authored-by: anorth <445306+anorth@users.noreply.github.com> Co-authored-by: vyzo <vyzo@hackzen.org> Co-authored-by: mriise <me@mriise.net>
diff --git a/actors/cron/src/state.rs b/actors/cron/src/state.rs
@@ -13,7 +13,7 @@ pub struct State {
     pub entries: Vec<Entry>,
 }
 
-#[derive(Clone, PartialEq, Debug, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, PartialEq, Eq, Debug, Serialize_tuple, Deserialize_tuple)]
 pub struct Entry {
     /// The actor to call (ID address)
     pub receiver: Address,
diff --git a/actors/market/src/deal.rs b/actors/market/src/deal.rs
@@ -25,7 +25,7 @@ pub fn is_piece_cid(c: &Cid) -> bool {
         && c.hash().size() == 32
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Label {
     String(String),
     Bytes(Vec<u8>),
@@ -90,7 +90,7 @@ impl Label {
 /// minimal deals that last for a long time.
 /// Note: ClientCollateralPerEpoch may not be needed and removed pending future confirmation.
 /// There will be a Minimum value for both client and provider deal collateral.
-#[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct DealProposal {
     pub piece_cid: Cid,
     pub piece_size: PaddedPieceSize,
@@ -139,15 +139,15 @@ impl DealProposal {
 }
 
 /// ClientDealProposal is a DealProposal signed by a client
-#[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct ClientDealProposal {
     pub proposal: DealProposal,
     pub client_signature: Signature,
 }
 
 impl Cbor for ClientDealProposal {}
 
-#[derive(Clone, Debug, PartialEq, Copy, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Copy, Serialize_tuple, Deserialize_tuple)]
 pub struct DealState {
     // -1 if not yet included in proven sector
     pub sector_start_epoch: ChainEpoch,
diff --git a/actors/market/src/ext.rs b/actors/market/src/ext.rs
@@ -28,7 +28,7 @@ pub mod verifreg {
     pub type UseBytesParams = BytesParams;
     pub type RestoreBytesParams = BytesParams;
 
-    #[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+    #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
     pub struct BytesParams {
         /// Address of verified client.
         pub address: Address,
diff --git a/actors/market/src/state.rs b/actors/market/src/state.rs
@@ -148,7 +148,7 @@ fn deal_get_payment_remaining(
 
 impl Cbor for State {}
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub(super) enum Permission {
     Invalid,
     ReadOnly,
diff --git a/actors/miner/src/commd.rs b/actors/miner/src/commd.rs
@@ -6,7 +6,7 @@ use multihash::Multihash;
 use serde::{Deserialize, Serialize};
 
 /// CompactCommD represents a Cid with compact representation of context dependant zero value
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Default)]
 #[serde(transparent)]
 pub struct CompactCommD(pub Option<Cid>);
 
diff --git a/actors/miner/src/deadline_info.rs b/actors/miner/src/deadline_info.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 /// "Deadline" refers to the window during which proofs may be submitted.
 /// Windows are non-overlapping ranges [Open, Close), but the challenge epoch for a window occurs
 /// before the window opens.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Copy, Clone)]
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq, Copy, Clone)]
 #[serde(rename_all = "PascalCase")]
 pub struct DeadlineInfo {
     /// Epoch at which this info was calculated.
diff --git a/actors/miner/src/partition_state.rs b/actors/miner/src/partition_state.rs
@@ -391,7 +391,7 @@ impl Partition {
         })?;
 
         // Ensure these sectors actually belong to this partition.
-        let present = &*sector_numbers & &self.sectors;
+        let present = sector_numbers & &self.sectors;
 
         // Filter out terminated sectors.
         let live = &present - &self.terminated;
@@ -756,7 +756,7 @@ impl Partition {
         let retracted_recovery_power = power_for_sectors(sector_size, &retracted_recovery_sectors);
 
         // Ignore skipped faults that are already faults or terminated.
-        let new_faults = &(&*skipped - &self.terminated) - &self.faults;
+        let new_faults = &(skipped - &self.terminated) - &self.faults;
         let new_fault_sectors =
             sectors.load_sector(&new_faults).map_err(|e| e.wrap("failed to load sectors"))?;
 
diff --git a/actors/miner/src/state.rs b/actors/miner/src/state.rs
@@ -112,7 +112,7 @@ pub struct State {
     pub deadline_cron_active: bool,
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum CollisionPolicy {
     AllowCollisions,
     DenyCollisions,
diff --git a/actors/miner/src/types.rs b/actors/miner/src/types.rs
@@ -239,14 +239,14 @@ pub struct WithdrawBalanceReturn {
     pub amount_withdrawn: TokenAmount,
 }
 
-#[derive(Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct WorkerKeyChange {
     /// Must be an ID address
     pub new_worker: Address,
     pub effective_at: ChainEpoch,
 }
 
-#[derive(Debug, Default, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct PreCommitSectorParams {
     pub seal_proof: RegisteredSealProof,
     pub sector_number: SectorNumber,
@@ -267,18 +267,18 @@ pub struct PreCommitSectorParams {
 
 impl Cbor for PreCommitSectorParams {}
 
-#[derive(Debug, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct PreCommitSectorBatchParams {
     pub sectors: Vec<PreCommitSectorParams>,
 }
-#[derive(Debug, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct PreCommitSectorBatchParams2 {
     pub sectors: Vec<SectorPreCommitInfo>,
 }
 
 impl Cbor for PreCommitSectorBatchParams {}
 
-#[derive(Debug, Default, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct SectorPreCommitInfo {
     pub seal_proof: RegisteredSealProof,
     pub sector_number: SectorNumber,
@@ -292,7 +292,7 @@ pub struct SectorPreCommitInfo {
 }
 
 /// Information stored on-chain for a pre-committed sector.
-#[derive(Debug, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct SectorPreCommitOnChainInfo {
     pub info: SectorPreCommitInfo,
     #[serde(with = "bigint_ser")]
@@ -301,7 +301,7 @@ pub struct SectorPreCommitOnChainInfo {
 }
 
 /// Information stored on-chain for a proven sector.
-#[derive(Debug, Default, PartialEq, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct SectorOnChainInfo {
     pub sector_number: SectorNumber,
     /// The seal proof type implies the PoSt proofs
@@ -337,7 +337,7 @@ pub struct SectorOnChainInfo {
     pub sector_key_cid: Option<Cid>,
 }
 
-#[derive(Debug, PartialEq, Copy, Clone, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Serialize_tuple, Deserialize_tuple)]
 pub struct Fault {
     pub miner: Address,
     pub fault: ChainEpoch,
@@ -354,7 +354,7 @@ pub struct ApplyRewardParams {
 
 impl Cbor for DisputeWindowedPoStParams {}
 
-#[derive(Debug, PartialEq, Clone, Copy, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize_tuple, Deserialize_tuple)]
 pub struct DisputeWindowedPoStParams {
     pub deadline: u64,
     pub post_index: u64, // only one is allowed at a time to avoid loading too many sector infos.
@@ -369,7 +369,7 @@ pub struct ProveCommitAggregateParams {
     pub aggregate_proof: Vec<u8>,
 }
 
-#[derive(Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct ReplicaUpdate {
     pub sector_number: SectorNumber,
     pub deadline: u64,
@@ -388,7 +388,7 @@ pub struct ProveReplicaUpdatesParams {
 
 impl Cbor for ProveReplicaUpdatesParams {}
 
-#[derive(Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct ReplicaUpdate2 {
     pub sector_number: SectorNumber,
     pub deadline: u64,
diff --git a/actors/miner/tests/deadline_state_test.rs b/actors/miner/tests/deadline_state_test.rs
@@ -546,8 +546,7 @@ fn fails_to_terminate_missing_sector() {
 
     assert!(ret.is_err());
     let err = ret
-        .err()
-        .expect("can only terminate live sectors")
+        .expect_err("can only terminate live sectors")
         .downcast::<ActorError>()
         .expect("Invalid error");
     assert_eq!(err.exit_code(), ExitCode::USR_ILLEGAL_ARGUMENT);
@@ -569,8 +568,7 @@ fn fails_to_terminate_missing_partition() {
 
     assert!(ret.is_err());
     let err = ret
-        .err()
-        .expect("can only terminate existing partitions")
+        .expect_err("can only terminate existing partitions")
         .downcast::<ActorError>()
         .expect("Invalid error");
     assert_eq!(err.exit_code(), ExitCode::USR_NOT_FOUND);
@@ -592,8 +590,7 @@ fn fails_to_terminate_already_terminated_sector() {
 
     assert!(ret.is_err());
     let err = ret
-        .err()
-        .expect("cannot terminate already terminated sector")
+        .expect_err("cannot terminate already terminated sector")
         .downcast::<ActorError>()
         .expect("Invalid error");
     assert_eq!(err.exit_code(), ExitCode::USR_ILLEGAL_ARGUMENT);
@@ -658,7 +655,7 @@ fn cannot_pop_expired_sectors_before_proving() {
     // try to pop some expirations
     let ret = deadline.pop_expired_sectors(rt.store(), 9, QUANT_SPEC);
     assert!(ret.is_err());
-    let err = ret.err().expect("cannot pop expired sectors from a partition with unproven sectors");
+    let err = ret.expect_err("cannot pop expired sectors from a partition with unproven sectors");
 
     assert!(err
         .to_string()
@@ -1172,8 +1169,7 @@ fn cannot_declare_faults_in_missing_partitions() {
     );
 
     let err = result
-        .err()
-        .expect("missing partition, should have failed")
+        .expect_err("missing partition, should have failed")
         .downcast::<ActorError>()
         .expect("Invalid error");
     assert_eq!(err.exit_code(), ExitCode::USR_NOT_FOUND);
@@ -1200,8 +1196,7 @@ fn cannot_declare_faults_recovered_in_missing_partitions() {
     );
 
     let err = result
-        .err()
-        .expect("missing partition, should have failed")
+        .expect_err("missing partition, should have failed")
         .downcast::<ActorError>()
         .expect("Invalid error");
     assert_eq!(err.exit_code(), ExitCode::USR_NOT_FOUND);
diff --git a/actors/miner/tests/expiration_queue.rs b/actors/miner/tests/expiration_queue.rs
@@ -677,7 +677,7 @@ fn rescheduling_all_expirations_as_faults_leaves_the_queue_empty_if_it_was_empty
 
     // all sectors already expire before epoch 15, nothing should change.
     let length = queue.amt.count();
-    let _ = queue.reschedule_all_as_faults(15).unwrap();
+    queue.reschedule_all_as_faults(15).unwrap();
     assert_eq!(queue.amt.count(), length);
 }
 
diff --git a/actors/multisig/src/types.rs b/actors/multisig/src/types.rs
@@ -37,7 +37,7 @@ impl Display for TxnID {
 }
 
 /// Transaction type used in multisig actor
-#[derive(Clone, PartialEq, Debug, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, PartialEq, Eq, Debug, Serialize_tuple, Deserialize_tuple)]
 pub struct Transaction {
     pub to: Address,
     #[serde(with = "bigint_ser")]
@@ -103,7 +103,7 @@ impl Cbor for ProposeParams {}
 impl Cbor for ProposeReturn {}
 
 /// Parameters for approve and cancel multisig functions.
-#[derive(Clone, PartialEq, Debug, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, PartialEq, Eq, Debug, Serialize_tuple, Deserialize_tuple)]
 pub struct TxnIDParams {
     pub id: TxnID,
     /// Optional hash of proposal to ensure an operation can only apply to a
diff --git a/actors/paych/src/state.rs b/actors/paych/src/state.rs
@@ -44,15 +44,15 @@ impl State {
 
 /// The Lane state tracks the latest (highest) voucher nonce used to merge the lane
 /// as well as the amount it has already redeemed.
-#[derive(Default, Clone, PartialEq, Debug, Serialize_tuple, Deserialize_tuple)]
+#[derive(Default, Clone, PartialEq, Eq, Debug, Serialize_tuple, Deserialize_tuple)]
 pub struct LaneState {
     #[serde(with = "bigint_ser")]
     pub redeemed: BigInt,
     pub nonce: u64,
 }
 
 /// Specifies which `lane`s to be merged with what `nonce` on `channel_update`
-#[derive(Default, Clone, Copy, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct Merge {
     pub lane: u64,
     pub nonce: u64,
diff --git a/actors/paych/src/types.rs b/actors/paych/src/types.rs
@@ -30,7 +30,7 @@ pub struct ConstructorParams {
 
 /// A voucher is sent by `from` to `to` off-chain in order to enable
 /// `to` to redeem payments on-chain in the future
-#[derive(Debug, Clone, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct SignedVoucher {
     /// ChannelAddr is the address of the payment channel this signed voucher is valid for
     pub channel_addr: Address,
@@ -99,7 +99,7 @@ impl SignedVoucher {
 }
 
 /// Modular Verification method
-#[derive(Debug, Clone, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct ModVerifyParams {
     pub actor: Address,
     pub method: MethodNum,
diff --git a/actors/power/src/state.rs b/actors/power/src/state.rs
@@ -385,7 +385,7 @@ pub fn epoch_key(e: ChainEpoch) -> BytesKey {
 
 impl Cbor for State {}
 
-#[derive(Debug, Serialize_tuple, Deserialize_tuple, Clone, PartialEq)]
+#[derive(Debug, Serialize_tuple, Deserialize_tuple, Clone, PartialEq, Eq)]
 pub struct Claim {
     /// Miner's proof type used to determine minimum miner size
     pub window_post_proof_type: RegisteredPoStProof,
diff --git a/actors/reward/src/state.rs b/actors/reward/src/state.rs
@@ -152,14 +152,14 @@ impl State {
 impl Cbor for State {}
 
 /// Defines vestion function type for reward actor.
-#[derive(Clone, Debug, PartialEq, Copy, FromPrimitive, Serialize_repr, Deserialize_repr)]
+#[derive(Clone, Debug, PartialEq, Eq, Copy, FromPrimitive, Serialize_repr, Deserialize_repr)]
 #[repr(u8)]
 pub enum VestingFunction {
     None = 0,
     Linear = 1,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct Reward {
     pub vesting_function: VestingFunction,
     pub start_epoch: ChainEpoch,
diff --git a/actors/reward/src/types.rs b/actors/reward/src/types.rs
@@ -6,7 +6,7 @@ use fvm_shared::address::Address;
 use fvm_shared::bigint::bigint_ser;
 use fvm_shared::econ::TokenAmount;
 
-#[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct AwardBlockRewardParams {
     pub miner: Address,
     #[serde(with = "bigint_ser")]
diff --git a/actors/verifreg/src/types.rs b/actors/verifreg/src/types.rs
@@ -26,7 +26,7 @@ pub type AddVerifierClientParams = VerifierParams;
 /// We can introduce policy changes and replace this in the future.
 pub type DataCap = StoragePower;
 
-#[derive(Clone, Debug, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct BytesParams {
     /// Address of verified client.
     pub address: Address,
diff --git a/runtime/src/actor_error.rs b/runtime/src/actor_error.rs
@@ -2,7 +2,7 @@ use fvm_shared::error::ExitCode;
 use thiserror::Error;
 
 /// The error type returned by actor method calls.
-#[derive(Error, Debug, Clone, PartialEq)]
+#[derive(Error, Debug, Clone, PartialEq, Eq)]
 #[error("ActorError(exit_code: {exit_code:?}, msg: {msg})")]
 pub struct ActorError {
     /// The exit code for this invocation.
diff --git a/runtime/src/test_utils.rs b/runtime/src/test_utils.rs
@@ -111,6 +111,7 @@ pub struct MockRuntime {
     pub caller: Address,
     pub caller_type: Cid,
     pub value_received: TokenAmount,
+    #[allow(clippy::type_complexity)]
     pub hash_func: Box<dyn Fn(&[u8]) -> [u8; 32]>,
     pub network_version: NetworkVersion,
 
@@ -1224,7 +1225,7 @@ pub fn blake2b_256(data: &[u8]) -> [u8; 32] {
 }
 
 // multihash library doesn't support poseidon hashing, so we fake it
-#[derive(Clone, Copy, Debug, Eq, Multihash, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Multihash)]
 #[mh(alloc_size = 64)]
 enum MhCode {
     #[mh(code = 0xb401, hasher = multihash::Sha2_256)]
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.59.0
+1.63.0
diff --git a/state/src/check.rs b/state/src/check.rs
diff --git a/test_vm/src/lib.rs b/test_vm/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ pub struct State {`
`13`	`13`	`pub entries: Vec<Entry>,`
`14`	`14`	`}`
`15`	`15`
`16`		`-#[derive(Clone, PartialEq, Debug, Serialize_tuple, Deserialize_tuple)]`
	`16`	`+#[derive(Clone, PartialEq, Eq, Debug, Serialize_tuple, Deserialize_tuple)]`
`17`	`17`	`pub struct Entry {`
`18`	`18`	`/// The actor to call (ID address)`
`19`	`19`	`pub receiver: Address,`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ pub struct State {`
`112`	`112`	`pub deadline_cron_active: bool,`
`113`	`113`	`}`
`114`	`114`
`115`		`-#[derive(PartialEq)]`
	`115`	`+#[derive(PartialEq, Eq)]`
`116`	`116`	`pub enum CollisionPolicy {`
`117`	`117`	`AllowCollisions,`
`118`	`118`	`DenyCollisions,`