fix: clippy warnings

pityjllk · pityjllk · commit e01a180336e2 · 2025-10-10T14:28:42.000+02:00
diff --git a/core/src/accounts.rs b/core/src/accounts.rs
@@ -8,7 +8,7 @@ use crate::{Nonce, Salt};
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AccountEvent<'a, T> {
     pub account_id: Cow<'a, AccountIdRef>,
 
@@ -62,12 +62,12 @@ impl<'a, T> AccountEvent<'a, T> {
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PublicKeyEvent<'a> {
     pub public_key: Cow<'a, PublicKey>,
 }
 
-impl<'a> PublicKeyEvent<'a> {
+impl PublicKeyEvent<'_> {
     #[inline]
     pub fn into_owned(self) -> PublicKeyEvent<'static> {
         PublicKeyEvent {
@@ -85,7 +85,7 @@ impl<'a> PublicKeyEvent<'a> {
     serde_as(schemars = false)
 )]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct NonceEvent {
     #[serde_as(as = "Base64")]
     pub nonce: Nonce,
@@ -100,7 +100,7 @@ impl NonceEvent {
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SaltRotationEvent {
     pub current: Salt,
     pub invalidated: BTreeSet<Salt>,
diff --git a/core/src/deadline.rs b/core/src/deadline.rs
@@ -22,7 +22,7 @@ impl Deadline {
     #[cfg(target_arch = "wasm32")]
     #[must_use]
     pub fn now() -> Self {
-        Self(defuse_near_utils::BLOCK_TIMESTAMP.clone())
+        Self(*defuse_near_utils::BLOCK_TIMESTAMP)
     }
 
     #[cfg(not(target_arch = "wasm32"))]
diff --git a/core/src/engine/inspector.rs b/core/src/engine/inspector.rs
@@ -25,7 +25,7 @@ pub struct InspectorImpl {
 }
 
 impl InspectorImpl {
-    pub fn new(event_sink: Rc<RefCell<EventSink>>) -> Self {
+    pub const fn new(event_sink: Rc<RefCell<EventSink>>) -> Self {
         Self {
             intents_executed: Vec::new(),
             min_deadline: Deadline::MAX,
@@ -37,9 +37,7 @@ impl InspectorImpl {
         self.event_sink
             .borrow()
             .recorded_events()
-            .into_iter()
-            .cloned()
-            .collect()
+            .to_vec()
     }
 }
 
diff --git a/core/src/events.rs b/core/src/events.rs
@@ -16,7 +16,7 @@ use crate::{
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(event_json(standard = "dip4"))]
-#[derive(Debug, Clone, Deserialize, From, PartialEq)]
+#[derive(Debug, Clone, Deserialize, From, PartialEq, Eq)]
 #[cfg_attr(
     all(feature = "abi", not(target_arch = "wasm32")),
     derive(schemars::JsonSchema)
@@ -73,7 +73,7 @@ pub enum DefuseEvent<'a> {
 }
 
 impl<'a> DefuseEvent<'a> {
-    /// Helper function to convert event slices to 'static using IntoStaticIntentEvent trait
+    /// Helper function to convert event slices to 'static using `IntoStaticIntentEvent` trait
     #[inline]
     fn convert_events<E>(events: Cow<'a, [E]>) -> Cow<'static, [E::Output]>
     where
diff --git a/core/src/fees.rs b/core/src/fees.rs
@@ -199,21 +199,21 @@ pub struct PipsOutOfRange;
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct FeeChangedEvent {
     pub old_fee: Pips,
     pub new_fee: Pips,
 }
 
 #[must_use = "make sure to `.emit()` this event"]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct FeeCollectorChangedEvent<'a> {
     pub old_fee_collector: Cow<'a, AccountIdRef>,
     pub new_fee_collector: Cow<'a, AccountIdRef>,
 }
 
-impl<'a> FeeCollectorChangedEvent<'a> {
+impl FeeCollectorChangedEvent<'_> {
     #[inline]
     pub fn into_owned(self) -> FeeCollectorChangedEvent<'static> {
         FeeCollectorChangedEvent {
diff --git a/core/src/intents/account.rs b/core/src/intents/account.rs
@@ -73,7 +73,7 @@ impl ExecutableIntent for RemovePublicKey {
     serde_as(schemars = false)
 )]
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SetAuthByPredecessorId {
     pub enabled: bool,
 }
diff --git a/core/src/intents/mod.rs b/core/src/intents/mod.rs
@@ -140,7 +140,7 @@ impl ExecutableIntent for Intent {
     serde_as(schemars = false)
 )]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct IntentEvent<T> {
     #[serde_as(as = "Base58")]
     pub intent_hash: CryptoHash,
@@ -149,7 +149,7 @@ pub struct IntentEvent<T> {
     pub event: T,
 }
 
-/// Trait for converting borrowed IntentEvent types to owned ('static) versions
+/// Trait for converting borrowed `IntentEvent` types to owned ('static) versions
 pub trait IntoStaticIntentEvent {
     type Output;
     fn into_static(self) -> Self::Output;
@@ -161,6 +161,7 @@ where
     T: ToOwned + ?Sized + 'static,
     T::Owned: 'static,
 {
+    #[allow(clippy::use_self)] // False positive: Output has 'static lifetime, not 'a
     type Output = IntentEvent<AccountEvent<'static, std::borrow::Cow<'static, T>>>;
 
     #[inline]
@@ -177,6 +178,7 @@ where
 
 // For IntentEvent with TokenDiffEvent
 impl<'a> IntoStaticIntentEvent for IntentEvent<AccountEvent<'a, token_diff::TokenDiffEvent<'a>>> {
+    #[allow(clippy::use_self)] // False positive: Output has 'static lifetime, not 'a
     type Output = IntentEvent<AccountEvent<'static, token_diff::TokenDiffEvent<'static>>>;
 
     #[inline]
@@ -189,7 +191,8 @@ impl<'a> IntoStaticIntentEvent for IntentEvent<AccountEvent<'a, token_diff::Toke
 }
 
 // For IntentEvent with NonceEvent specifically
-impl<'a> IntoStaticIntentEvent for IntentEvent<AccountEvent<'a, crate::accounts::NonceEvent>> {
+impl IntoStaticIntentEvent for IntentEvent<AccountEvent<'_, crate::accounts::NonceEvent>> {
+    #[allow(clippy::use_self)] // False positive: Output has 'static lifetime, not '_
     type Output = IntentEvent<AccountEvent<'static, crate::accounts::NonceEvent>>;
 
     #[inline]
diff --git a/core/src/intents/token_diff.rs b/core/src/intents/token_diff.rs
@@ -118,7 +118,7 @@ impl ExecutableIntent for TokenDiff {
     serde_as(schemars = false)
 )]
 #[near(serializers = [json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// An event emitted when a `TokenDiff` intent is executed.
 pub struct TokenDiffEvent<'a> {
     #[serde(flatten)]
diff --git a/core/src/intents/tokens.rs b/core/src/intents/tokens.rs
@@ -23,7 +23,7 @@ use super::{ExecutableIntent, IntentEvent};
     serde_as(schemars = false)
 )]
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Transfer a set of tokens from the signer to a specified account id, within the intents contract.
 pub struct Transfer {
     pub receiver_id: AccountId,
@@ -71,7 +71,7 @@ impl ExecutableIntent for Transfer {
 }
 
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Withdraw given FT tokens from the intents contract to a given external account id (external being outside of intents).
 pub struct FtWithdraw {
     pub token: AccountId,
@@ -166,7 +166,7 @@ impl ExecutableIntent for FtWithdraw {
 }
 
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Withdraw given NFT tokens from the intents contract to a given external account id (external being outside of intents).
 pub struct NftWithdraw {
     pub token: AccountId,
@@ -261,7 +261,7 @@ impl ExecutableIntent for NftWithdraw {
 }
 
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Withdraw given MT tokens (i.e. [NEP-245](https://github.com/near/NEPs/blob/master/neps/nep-0245.md)) from the intents contract
 /// to a given to an external account id (external being outside of intents).
 ///
@@ -363,7 +363,7 @@ impl ExecutableIntent for MtWithdraw {
 }
 
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Withdraw native tokens (NEAR) from the intents contract to a given external account id (external being outside of intents).
 /// This will subtract from the account's wNEAR balance, and will be sent to the account specified as native NEAR.
 /// NOTE: the `wNEAR` will not be refunded in case of fail (e.g. `receiver_id`
@@ -411,7 +411,7 @@ impl ExecutableIntent for NativeWithdraw {
 /// are not guaranteed to be executed sequentially, in the order of the provided intents in
 /// `DefuseIntents`.
 #[near(serializers = [borsh, json])]
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct StorageDeposit {
     pub contract_id: AccountId,
     #[serde(
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -46,10 +46,11 @@ impl EventSink {
         }
     }
 
-    pub fn record_only_mode(&mut self) {
+    pub const fn record_only_mode(&mut self) {
         self.mode = EventMode::Record;
     }
 
+    #[allow(clippy::missing_const_for_fn)] // False positive: cannot be const due to Vec deref
     pub fn recorded_events(&self) -> &[events::DefuseEvent<'static>] {
         &self.events
     }
diff --git a/defuse/src/contract/accounts/force.rs b/defuse/src/contract/accounts/force.rs
@@ -96,7 +96,7 @@ impl Contract {
                 self.emit_defuse_event(DefuseEvent::SetAuthByPredecessorId(AccountEvent::new(
                     Cow::Borrowed(account_id.as_ref()),
                     SetAuthByPredecessorId { enabled: enable },
-                )))
+                )));
             }
         })
     }
diff --git a/defuse/src/contract/intents/mod.rs b/defuse/src/contract/intents/mod.rs
@@ -34,8 +34,8 @@ impl Intents for Contract {
         //NOTE: previously emitted in inspector drop
         if !inspector.intents_executed.is_empty() {
             self.emit_defuse_event(
-                DefuseEvent::IntentsExecuted(inspector.intents_executed.as_slice().into()).into(),
-            )
+                DefuseEvent::IntentsExecuted(inspector.intents_executed.as_slice().into()),
+            );
         }
     }
 
diff --git a/defuse/src/contract/intents/state.rs b/defuse/src/contract/intents/state.rs
@@ -107,13 +107,13 @@ impl State for Contract {
             .ok_or_else(|| DefuseError::AccountLocked(account_id.clone()))?
             .add_public_key(&account_id, public_key)
             .then_some(())
-            .inspect(|_| {
+            .inspect(|()| {
                 self.emit_defuse_event(DefuseEvent::PublicKeyAdded(AccountEvent::new(
                     Cow::Borrowed(account_id.as_ref()),
                     PublicKeyEvent {
                         public_key: Cow::Borrowed(&public_key),
                     },
-                )))
+                )));
             })
             .ok_or(DefuseError::PublicKeyExists(account_id, public_key))
     }
@@ -126,13 +126,13 @@ impl State for Contract {
             .ok_or_else(|| DefuseError::AccountLocked(account_id.clone()))?
             .remove_public_key(&account_id, &public_key)
             .then_some(())
-            .inspect(|_| {
+            .inspect(|()| {
                 self.emit_defuse_event(DefuseEvent::PublicKeyRemoved(AccountEvent::new(
                     Cow::Borrowed(account_id.as_ref()),
                     PublicKeyEvent {
                         public_key: Cow::Borrowed(&public_key),
                     },
-                )))
+                )));
             })
             .ok_or(DefuseError::PublicKeyNotExist(account_id, public_key))
     }
diff --git a/defuse/src/contract/mod.rs b/defuse/src/contract/mod.rs
@@ -91,7 +91,7 @@ impl Contract {
     }
 
     pub fn record_events_instead_of_emitting(&self) {
-        self.event_sink.borrow_mut().record_only_mode()
+        self.event_sink.borrow_mut().record_only_mode();
     }
 
     pub fn event_sink_handle(&self) -> Rc<RefCell<EventSink>> {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ impl Deadline {`
`22`	`22`	`#[cfg(target_arch = "wasm32")]`
`23`	`23`	`#[must_use]`
`24`	`24`	`pub fn now() -> Self {`
`25`		`- Self(defuse_near_utils::BLOCK_TIMESTAMP.clone())`
	`25`	`+ Self(*defuse_near_utils::BLOCK_TIMESTAMP)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#[cfg(not(target_arch = "wasm32"))]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ pub struct InspectorImpl {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`impl InspectorImpl {`
`28`		`- pub fn new(event_sink: Rc<RefCell<EventSink>>) -> Self {`
	`28`	`+ pub const fn new(event_sink: Rc<RefCell<EventSink>>) -> Self {`
`29`	`29`	`Self {`
`30`	`30`	`intents_executed: Vec::new(),`
`31`	`31`	`min_deadline: Deadline::MAX,`
`@@ -37,9 +37,7 @@ impl InspectorImpl {`
`37`	`37`	`self.event_sink`
`38`	`38`	`.borrow()`
`39`	`39`	`.recorded_events()`
`40`		`- .into_iter()`
`41`		`- .cloned()`
`42`		`- .collect()`
	`40`	`+ .to_vec()`
`43`	`41`	`}`
`44`	`42`	`}`
`45`	`43`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl ExecutableIntent for RemovePublicKey {`
`73`	`73`	`serde_as(schemars = false)`
`74`	`74`	`)]`
`75`	`75`	`#[near(serializers = [borsh, json])]`
`76`		`-#[derive(Debug, Clone, PartialEq)]`
	`76`	`+#[derive(Debug, Clone, PartialEq, Eq)]`
`77`	`77`	`pub struct SetAuthByPredecessorId {`
`78`	`78`	`pub enabled: bool,`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,11 @@ impl EventSink {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- pub fn record_only_mode(&mut self) {`
	`49`	`+ pub const fn record_only_mode(&mut self) {`
`50`	`50`	`self.mode = EventMode::Record;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ #[allow(clippy::missing_const_for_fn)] // False positive: cannot be const due to Vec deref`
`53`	`54`	`pub fn recorded_events(&self) -> &[events::DefuseEvent<'static>] {`
`54`	`55`	`&self.events`
`55`	`56`	`}`