From 30e506343a9470d354cea8875c73d50cb1e83e3c Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Mon, 2 Dec 2024 16:45:27 +0800 Subject: [PATCH] chore: upgrade rust toolchain --- actors/evm/src/evm_shared/v10/uints.rs | 2 +- actors/evm/src/evm_shared/v11/uints.rs | 2 +- actors/evm/src/evm_shared/v12/uints.rs | 2 +- actors/evm/src/evm_shared/v13/uints.rs | 2 +- actors/evm/src/evm_shared/v14/uints.rs | 2 +- actors/evm/src/evm_shared/v15/uints.rs | 2 +- actors/market/src/v10/state.rs | 5 ++++- actors/market/src/v11/state.rs | 5 ++++- actors/market/src/v12/state.rs | 5 ++++- fil_actors_shared/src/v10/runtime/policy.rs | 4 ++-- fil_actors_shared/src/v10/util/set.rs | 2 +- fil_actors_shared/src/v11/runtime/policy.rs | 4 ++-- fil_actors_shared/src/v11/util/set.rs | 2 +- fil_actors_shared/src/v12/util/set.rs | 2 +- fil_actors_shared/src/v13/util/set.rs | 2 +- fil_actors_shared/src/v8/util/set.rs | 2 +- fil_actors_shared/src/v9/runtime/policy.rs | 4 ++-- fil_actors_shared/src/v9/util/set.rs | 2 +- forest | 2 +- rust-toolchain.toml | 2 +- 20 files changed, 32 insertions(+), 23 deletions(-) diff --git a/actors/evm/src/evm_shared/v10/uints.rs b/actors/evm/src/evm_shared/v10/uints.rs index 9a454acc..6c3a7942 100644 --- a/actors/evm/src/evm_shared/v10/uints.rs +++ b/actors/evm/src/evm_shared/v10/uints.rs @@ -210,7 +210,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/evm/src/evm_shared/v11/uints.rs b/actors/evm/src/evm_shared/v11/uints.rs index 2354d6fc..831dfca7 100644 --- a/actors/evm/src/evm_shared/v11/uints.rs +++ b/actors/evm/src/evm_shared/v11/uints.rs @@ -211,7 +211,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/evm/src/evm_shared/v12/uints.rs b/actors/evm/src/evm_shared/v12/uints.rs index 98a3458b..02e0d662 100644 --- a/actors/evm/src/evm_shared/v12/uints.rs +++ b/actors/evm/src/evm_shared/v12/uints.rs @@ -205,7 +205,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/evm/src/evm_shared/v13/uints.rs b/actors/evm/src/evm_shared/v13/uints.rs index 476075cf..50222e8a 100644 --- a/actors/evm/src/evm_shared/v13/uints.rs +++ b/actors/evm/src/evm_shared/v13/uints.rs @@ -202,7 +202,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/evm/src/evm_shared/v14/uints.rs b/actors/evm/src/evm_shared/v14/uints.rs index 476075cf..50222e8a 100644 --- a/actors/evm/src/evm_shared/v14/uints.rs +++ b/actors/evm/src/evm_shared/v14/uints.rs @@ -202,7 +202,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/evm/src/evm_shared/v15/uints.rs b/actors/evm/src/evm_shared/v15/uints.rs index 476075cf..50222e8a 100644 --- a/actors/evm/src/evm_shared/v15/uints.rs +++ b/actors/evm/src/evm_shared/v15/uints.rs @@ -202,7 +202,7 @@ impl<'de> Deserialize<'de> for U256 { D: serde::Deserializer<'de>, { struct Visitor; - impl<'de> serde::de::Visitor<'de> for Visitor { + impl serde::de::Visitor<'_> for Visitor { type Value = U256; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/actors/market/src/v10/state.rs b/actors/market/src/v10/state.rs index e6826d18..82f1d542 100644 --- a/actors/market/src/v10/state.rs +++ b/actors/market/src/v10/state.rs @@ -275,7 +275,10 @@ impl State { Ok(rval_deal_state) } - pub fn get_proposal_array<'a, BS>(&'a self, store: &'a BS) -> Result, ActorError> + pub fn get_proposal_array<'a, BS>( + &'a self, + store: &'a BS, + ) -> Result, ActorError> where BS: Blockstore, { diff --git a/actors/market/src/v11/state.rs b/actors/market/src/v11/state.rs index a9ae0a06..9930877e 100644 --- a/actors/market/src/v11/state.rs +++ b/actors/market/src/v11/state.rs @@ -273,7 +273,10 @@ impl State { Ok(rval_deal_state) } - pub fn get_proposal_array<'a, BS>(&'a self, store: &'a BS) -> Result, ActorError> + pub fn get_proposal_array<'a, BS>( + &'a self, + store: &'a BS, + ) -> Result, ActorError> where BS: Blockstore, { diff --git a/actors/market/src/v12/state.rs b/actors/market/src/v12/state.rs index a60e0367..1394996a 100644 --- a/actors/market/src/v12/state.rs +++ b/actors/market/src/v12/state.rs @@ -272,7 +272,10 @@ impl State { Ok(rval_deal_state) } - pub fn get_proposal_array<'a, BS>(&'a self, store: &'a BS) -> Result, ActorError> + pub fn get_proposal_array<'a, BS>( + &'a self, + store: &'a BS, + ) -> Result, ActorError> where BS: Blockstore, { diff --git a/fil_actors_shared/src/v10/runtime/policy.rs b/fil_actors_shared/src/v10/runtime/policy.rs index 2cfa2e5c..f5beb542 100644 --- a/fil_actors_shared/src/v10/runtime/policy.rs +++ b/fil_actors_shared/src/v10/runtime/policy.rs @@ -82,7 +82,7 @@ pub struct Policy { pub pre_commit_challenge_delay: ChainEpoch, /// Look-back from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. @@ -314,7 +314,7 @@ pub mod policy_constants { pub const PRE_COMMIT_CHALLENGE_DELAY: ChainEpoch = 150; /// Lookback from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. diff --git a/fil_actors_shared/src/v10/util/set.rs b/fil_actors_shared/src/v10/util/set.rs index af1300de..554c92e2 100644 --- a/fil_actors_shared/src/v10/util/set.rs +++ b/fil_actors_shared/src/v10/util/set.rs @@ -12,7 +12,7 @@ use crate::v10::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/fil_actors_shared/src/v11/runtime/policy.rs b/fil_actors_shared/src/v11/runtime/policy.rs index 04835369..917fbf1b 100644 --- a/fil_actors_shared/src/v11/runtime/policy.rs +++ b/fil_actors_shared/src/v11/runtime/policy.rs @@ -82,7 +82,7 @@ pub struct Policy { pub pre_commit_challenge_delay: ChainEpoch, /// Lookback from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. @@ -308,7 +308,7 @@ pub mod policy_constants { pub const PRE_COMMIT_CHALLENGE_DELAY: ChainEpoch = 150; /// Lookback from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. diff --git a/fil_actors_shared/src/v11/util/set.rs b/fil_actors_shared/src/v11/util/set.rs index 8113b124..97cb8040 100644 --- a/fil_actors_shared/src/v11/util/set.rs +++ b/fil_actors_shared/src/v11/util/set.rs @@ -12,7 +12,7 @@ use crate::v11::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/fil_actors_shared/src/v12/util/set.rs b/fil_actors_shared/src/v12/util/set.rs index f7940c36..689d1b9c 100644 --- a/fil_actors_shared/src/v12/util/set.rs +++ b/fil_actors_shared/src/v12/util/set.rs @@ -12,7 +12,7 @@ use crate::v12::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/fil_actors_shared/src/v13/util/set.rs b/fil_actors_shared/src/v13/util/set.rs index 018dcaeb..320d9b24 100644 --- a/fil_actors_shared/src/v13/util/set.rs +++ b/fil_actors_shared/src/v13/util/set.rs @@ -12,7 +12,7 @@ use crate::v13::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/fil_actors_shared/src/v8/util/set.rs b/fil_actors_shared/src/v8/util/set.rs index 823ade4d..7993e2e1 100644 --- a/fil_actors_shared/src/v8/util/set.rs +++ b/fil_actors_shared/src/v8/util/set.rs @@ -12,7 +12,7 @@ use crate::v8::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/fil_actors_shared/src/v9/runtime/policy.rs b/fil_actors_shared/src/v9/runtime/policy.rs index bbfaf8e3..3a941922 100644 --- a/fil_actors_shared/src/v9/runtime/policy.rs +++ b/fil_actors_shared/src/v9/runtime/policy.rs @@ -82,7 +82,7 @@ pub struct Policy { pub pre_commit_challenge_delay: ChainEpoch, /// Look-back from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. @@ -314,7 +314,7 @@ pub mod policy_constants { pub const PRE_COMMIT_CHALLENGE_DELAY: ChainEpoch = 150; /// Lookback from the deadline's challenge window opening from which to sample chain randomness for the challenge seed. - + /// /// This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) /// but without making the miner wait for chain stability before being able to start on PoSt computation. /// The challenge is available this many epochs before the window is actually open to receiving a PoSt. diff --git a/fil_actors_shared/src/v9/util/set.rs b/fil_actors_shared/src/v9/util/set.rs index cdf62964..5717eb5d 100644 --- a/fil_actors_shared/src/v9/util/set.rs +++ b/fil_actors_shared/src/v9/util/set.rs @@ -12,7 +12,7 @@ use crate::v9::{make_empty_map, make_map_with_root, BytesKey, Map}; #[derive(Debug)] pub struct Set<'a, BS>(Map<'a, BS, ()>); -impl<'a, BS: Blockstore> PartialEq for Set<'a, BS> { +impl PartialEq for Set<'_, BS> { fn eq(&self, other: &Self) -> bool { self.0 == other.0 } diff --git a/forest b/forest index 9a2d2c4b..98d181e6 160000 --- a/forest +++ b/forest @@ -1 +1 @@ -Subproject commit 9a2d2c4bee7a5b0693b83bcaac810d892c24c63b +Subproject commit 98d181e6b41aaafb6d4c99c009e0486749190104 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 28018d94..cd27e121 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.82.0" +channel = "1.83.0" components = ["clippy", "llvm-tools-preview", "rustfmt"] targets = []