cargo clippy & fmt

multiversx · Nov 18, 2024 · 835d656 · 835d656
1 parent cc250e1
commit 835d656
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
@@ -35,12 +35,9 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigFloat<M> {
         self.handle.clone()
     }
 
-    unsafe fn forget_into_handle(mut self) -> Self::OwnHandle {
+    unsafe fn forget_into_handle(self) -> Self::OwnHandle {
         unsafe {
-            let handle = core::mem::replace(
-                &mut self.handle,
-                core::mem::MaybeUninit::uninit().assume_init(),
-            );
+            let handle = core::ptr::read(&self.handle);
             core::mem::forget(self);
             handle
         }

diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
@@ -38,12 +38,9 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigInt<M> {
         self.handle.clone()
     }
 
-    unsafe fn forget_into_handle(mut self) -> Self::OwnHandle {
+    unsafe fn forget_into_handle(self) -> Self::OwnHandle {
         unsafe {
-            let handle = core::mem::replace(
-                &mut self.handle,
-                core::mem::MaybeUninit::uninit().assume_init(),
-            );
+            let handle = core::ptr::read(&self.handle);
             core::mem::forget(self);
             handle
         }

diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -43,12 +43,9 @@ impl<M: ManagedTypeApi> ManagedType<M> for EllipticCurve<M> {
         self.handle.clone()
     }
 
-    unsafe fn forget_into_handle(mut self) -> Self::OwnHandle {
+    unsafe fn forget_into_handle(self) -> Self::OwnHandle {
         unsafe {
-            let handle = core::mem::replace(
-                &mut self.handle,
-                core::mem::MaybeUninit::uninit().assume_init(),
-            );
+            let handle = core::ptr::read(&self.handle);
             core::mem::forget(self);
             handle
         }

diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -37,12 +37,9 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedBuffer<M> {
         self.handle.clone()
     }
 
-    unsafe fn forget_into_handle(mut self) -> Self::OwnHandle {
+    unsafe fn forget_into_handle(self) -> Self::OwnHandle {
         unsafe {
-            let handle = core::mem::replace(
-                &mut self.handle,
-                core::mem::MaybeUninit::uninit().assume_init(),
-            );
+            let handle = core::ptr::read(&self.handle);
             core::mem::forget(self);
             handle
         }

diff --git a/framework/base/src/types/managed/basic/managed_map.rs b/framework/base/src/types/managed/basic/managed_map.rs
@@ -23,12 +23,9 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedMap<M> {
         self.handle.clone()
     }
 
-    unsafe fn forget_into_handle(mut self) -> Self::OwnHandle {
+    unsafe fn forget_into_handle(self) -> Self::OwnHandle {
         unsafe {
-            let handle = core::mem::replace(
-                &mut self.handle,
-                core::mem::MaybeUninit::uninit().assume_init(),
-            );
+            let handle = core::ptr::read(&self.handle);
             core::mem::forget(self);
             handle
         }

diff --git a/framework/base/src/types/managed/managed_type_trait.rs b/framework/base/src/types/managed/managed_type_trait.rs
@@ -12,8 +12,18 @@ pub trait ManagedType<M: ManagedTypeApi>: Sized {
     fn get_handle(&self) -> Self::OwnHandle;
 
     /// Forgets current object (does not run destructor), but extracts the handle.
-    /// 
+    ///
     /// The handle remains an owned object, so the handle's destructor will run later, when dropped.
+    ///
+    /// ## Safety
+    ///
+    /// Destructures the object, without running a constructor.
+    ///
+    /// To avoid a memory leak, it is necessary for the object to be later
+    /// reconstructed from handle and its destructor run.
+    ///
+    /// It is designed to be used ManagedVec and ManagedOption,
+    /// where items are dropped later, together with their container.
     unsafe fn forget_into_handle(self) -> Self::OwnHandle;
 
     #[doc(hidden)]