Merge pull request #2137 from multiversx/rustc-1-89

Upgrade to rustc 1.89, clippy fixes

Author: andrei-marinica

chain/vm/src/blockchain/state/esdt_data.rs

@@ -146,7 +146,7 @@ impl AccountEsdt {
             .attributes = new_attribute_bytes;
     }
 
-    pub fn iter(&self) -> Iter<Vec<u8>, EsdtData> {
+    pub fn iter(&self) -> Iter<'_, Vec<u8>, EsdtData> {
         self.0.iter()
     }
 

chain/vm/src/builtin_functions/general/migrate_username_mock.rs

@@ -1,3 +1,6 @@
+//! No longer used, since it the builtin function was dropped.
+#![allow(unused)]
+
 use crate::chain_core::builtin_func_names::MIGRATE_USERNAME_FUNC_NAME;
 use crate::host::context::{BlockchainUpdate, TxCache, TxInput, TxResult};
 use crate::host::runtime::{RuntimeInstanceCallLambda, RuntimeRef};

chain/vm/src/host/context/tx_context.rs

@@ -130,23 +130,23 @@ impl TxContext {
         self.with_account_mut(&self.tx_input_box.to, f)
     }
 
-    pub fn m_types_lock(&self) -> MutexGuard<ManagedTypeContainer> {
+    pub fn m_types_lock(&self) -> MutexGuard<'_, ManagedTypeContainer> {
         self.managed_types.lock().unwrap()
     }
 
-    pub fn back_transfers_lock(&self) -> MutexGuard<BackTransfers> {
+    pub fn back_transfers_lock(&self) -> MutexGuard<'_, BackTransfers> {
         self.back_transfers.lock().unwrap()
     }
 
-    pub fn result_lock(&self) -> MutexGuard<TxResult> {
+    pub fn result_lock(&self) -> MutexGuard<'_, TxResult> {
         self.tx_result_cell.lock().unwrap()
     }
 
     pub fn extract_result(&self) -> TxResult {
         std::mem::replace(&mut *self.tx_result_cell.lock().unwrap(), TxResult::empty())
     }
 
-    pub fn rng_lock(&self) -> MutexGuard<BlockchainRng> {
+    pub fn rng_lock(&self) -> MutexGuard<'_, BlockchainRng> {
         self.b_rng.lock().unwrap()
     }
 

chain/vm/src/host/vm_hooks/vh_context.rs

@@ -27,7 +27,7 @@ pub trait VMHooksContext: Debug {
     /// The offset and the length must point to valid instance memory.
     unsafe fn memory_store(&self, mem_ptr: MemPtr, data: &[u8]);
 
-    fn m_types_lock(&self) -> MutexGuard<ManagedTypeContainer>;
+    fn m_types_lock(&self) -> MutexGuard<'_, ManagedTypeContainer>;
 
     fn gas_schedule(&self) -> &GasSchedule;
 
@@ -46,7 +46,7 @@ pub trait VMHooksContext: Debug {
     /// Random number generator, based on the blockchain randomness source.
     fn random_next_bytes(&self, length: usize) -> Vec<u8>;
 
-    fn result_lock(&self) -> MutexGuard<TxResult>;
+    fn result_lock(&self) -> MutexGuard<'_, TxResult>;
 
     fn push_tx_log(&self, tx_log: TxLog) {
         self.result_lock().result_logs.push(tx_log);
@@ -62,7 +62,7 @@ pub trait VMHooksContext: Debug {
 
     fn get_block_config(&self) -> &BlockConfig;
 
-    fn back_transfers_lock(&self) -> MutexGuard<BackTransfers>;
+    fn back_transfers_lock(&self) -> MutexGuard<'_, BackTransfers>;
 
     /// For ownership reasons, needs to return a clone.
     ///

chain/vm/src/host/vm_hooks/vh_tx_context.rs

@@ -56,7 +56,7 @@ impl<S: InstanceState> VMHooksContext for TxVMHooksContext<S> {
             .expect("error writing to wasmer instance memory");
     }
 
-    fn m_types_lock(&self) -> MutexGuard<ManagedTypeContainer> {
+    fn m_types_lock(&self) -> MutexGuard<'_, ManagedTypeContainer> {
         self.tx_context_ref.m_types_lock()
     }
 
@@ -93,7 +93,7 @@ impl<S: InstanceState> VMHooksContext for TxVMHooksContext<S> {
         self.tx_context_ref.rng_lock().next_bytes(length)
     }
 
-    fn result_lock(&self) -> MutexGuard<TxResult> {
+    fn result_lock(&self) -> MutexGuard<'_, TxResult> {
         self.tx_context_ref.result_lock()
     }
 
@@ -117,7 +117,7 @@ impl<S: InstanceState> VMHooksContext for TxVMHooksContext<S> {
         &self.tx_context_ref.blockchain_ref().block_config
     }
 
-    fn back_transfers_lock(&self) -> MutexGuard<BackTransfers> {
+    fn back_transfers_lock(&self) -> MutexGuard<'_, BackTransfers> {
         self.tx_context_ref.back_transfers_lock()
     }
 

contracts/examples/rewards-distribution/tests/rewards_distribution_integration_test.rs

@@ -94,6 +94,7 @@ impl RewardsDistributionTestState {
 }
 
 #[test]
+#[ignore = "long running test, run on demand"]
 fn test_compute_brackets() {
     let mut state = RewardsDistributionTestState::new();
 

framework/base/src/storage/mappers/bi_di_mapper.rs

@@ -127,15 +127,15 @@ where
         self.value_set_mapper.contains(value)
     }
 
-    pub fn get_all_values(&self) -> unordered_set_mapper::Iter<SA, V, A> {
+    pub fn get_all_values(&self) -> unordered_set_mapper::Iter<'_, SA, V, A> {
         self.value_set_mapper.iter()
     }
 
-    pub fn get_all_ids(&self) -> unordered_set_mapper::Iter<SA, K, A> {
+    pub fn get_all_ids(&self) -> unordered_set_mapper::Iter<'_, SA, K, A> {
         self.id_set_mapper.iter()
     }
 
-    pub fn iter(&self) -> Iter<SA, K, V, A> {
+    pub fn iter(&self) -> Iter<'_, SA, K, V, A> {
         Iter::new(self)
     }
 

framework/base/src/storage/mappers/linked_list_mapper.rs

@@ -218,11 +218,11 @@ where
         Some(self.get_node(node_id))
     }
 
-    pub fn iter(&self) -> Iter<SA, T, A> {
+    pub fn iter(&self) -> Iter<'_, SA, T, A> {
         Iter::new(self)
     }
 
-    pub fn iter_from_node_id(&self, node_id: u32) -> Iter<SA, T, A> {
+    pub fn iter_from_node_id(&self, node_id: u32) -> Iter<'_, SA, T, A> {
         Iter::new_from_node_id(self, node_id)
     }
 

framework/base/src/storage/mappers/map_mapper.rs

@@ -165,7 +165,7 @@ where
         None
     }
 
-    pub fn keys(&self) -> Keys<SA, A, K> {
+    pub fn keys(&self) -> Keys<'_, SA, A, K> {
         self.keys_set.iter()
     }
 
@@ -198,13 +198,13 @@ where
 
     /// An iterator visiting all values in arbitrary order.
     /// The iterator element type is `&'a V`.
-    pub fn values(&self) -> Values<SA, A, K, V> {
+    pub fn values(&self) -> Values<'_, SA, A, K, V> {
         Values::new(self)
     }
 
     /// An iterator visiting all key-value pairs in arbitrary order.
     /// The iterator element type is `(&'a K, &'a V)`.
-    pub fn iter(&self) -> Iter<SA, A, K, V> {
+    pub fn iter(&self) -> Iter<'_, SA, A, K, V> {
         Iter::new(self)
     }
 }

framework/base/src/storage/mappers/map_storage_mapper.rs

@@ -131,7 +131,7 @@ where
         None
     }
 
-    pub fn keys(&self) -> Keys<SA, A, K> {
+    pub fn keys(&self) -> Keys<'_, SA, A, K> {
         self.keys_set.iter()
     }
 
@@ -151,7 +151,7 @@ where
     }
 
     /// Gets the given key's corresponding entry in the map for in-place manipulation.
-    pub fn entry(&mut self, key: K) -> Entry<SA, A, K, V> {
+    pub fn entry(&mut self, key: K) -> Entry<'_, SA, A, K, V> {
         if self.contains_key(&key) {
             Entry::Occupied(OccupiedEntry {
                 key,
@@ -169,13 +169,13 @@ where
 
     /// An iterator visiting all values in arbitrary order.
     /// The iterator element type is `&'a V`.
-    pub fn values(&self) -> Values<SA, A, K, V> {
+    pub fn values(&self) -> Values<'_, SA, A, K, V> {
         Values::new(self)
     }
 
     /// An iterator visiting all key-value pairs in arbitrary order.
     /// The iterator element type is `(&'a K, &'a V)`.
-    pub fn iter(&self) -> Iter<SA, A, K, V> {
+    pub fn iter(&self) -> Iter<'_, SA, A, K, V> {
         Iter::new(self)
     }
 }