Use drop to fix compiler warnings (#245)

garvys-org · Aug 21, 2023 · 7a50cfd · 7a50cfd
1 parent 9acc243
commit 7a50cfd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 33 deletions.
diff --git a/rustfst-ffi/src/algorithms/compose.rs b/rustfst-ffi/src/algorithms/compose.rs
@@ -268,9 +268,7 @@ pub extern "C" fn fst_matcher_config_destroy(ptr: *mut CMatcherConfig) -> RUSTFS
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(ptr);
-        }
+        unsafe { drop(Box::from_raw(ptr)) }
         Ok(())
     })
 }
@@ -282,9 +280,7 @@ pub extern "C" fn fst_compose_config_destroy(ptr: *mut CComposeConfig) -> RUSTFS
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(ptr);
-        }
+        unsafe { drop(Box::from_raw(ptr)) }
         Ok(())
     })
 }

diff --git a/rustfst-ffi/src/fst/mod.rs b/rustfst-ffi/src/fst/mod.rs
@@ -326,9 +326,7 @@ pub fn fst_destroy(fst_ptr: *mut CFst) -> RUSTFST_FFI_RESULT {
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(fst_ptr);
-        }
+        unsafe { drop(Box::from_raw(fst_ptr)) }
         Ok(())
     })
 }
diff --git a/rustfst-ffi/src/iterators.rs b/rustfst-ffi/src/iterators.rs
@@ -112,9 +112,7 @@ pub extern "C" fn trs_iterator_destroy(iter_ptr: *mut CTrsIterator) -> RUSTFST_F
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(iter_ptr);
-        }
+        unsafe { drop(Box::from_raw(iter_ptr)) }
         Ok(())
     })
 }
@@ -273,9 +271,7 @@ pub extern "C" fn mut_trs_iterator_destroy(iter_ptr: *mut CMutTrsIterator) -> RU
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(iter_ptr);
-        }
+        unsafe { drop(Box::from_raw(iter_ptr)) }
         Ok(())
     })
 }
@@ -332,9 +328,7 @@ pub extern "C" fn state_iterator_destroy(iter_ptr: *mut CStateIterator) -> RUSTF
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(iter_ptr);
-        }
+        unsafe { drop(Box::from_raw(iter_ptr)) }
         Ok(())
     })
 }
diff --git a/rustfst-ffi/src/string_path.rs b/rustfst-ffi/src/string_path.rs
@@ -16,9 +16,7 @@ pub extern "C" fn string_path_destroy(iter_ptr: *mut CStringPath) -> RUSTFST_FFI
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(iter_ptr);
-        }
+        unsafe { drop(Box::from_raw(iter_ptr)) }
         Ok(())
     })
 }

diff --git a/rustfst-ffi/src/string_paths_iterator.rs b/rustfst-ffi/src/string_paths_iterator.rs
@@ -104,9 +104,7 @@ pub extern "C" fn string_paths_iterator_destroy(
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(iter_ptr);
-        }
+        unsafe { drop(Box::from_raw(iter_ptr)) }
         Ok(())
     })
 }
diff --git a/rustfst-ffi/src/symbol_table.rs b/rustfst-ffi/src/symbol_table.rs
@@ -205,9 +205,7 @@ pub extern "C" fn symt_destroy(symt_ptr: *mut CSymbolTable) -> RUSTFST_FFI_RESUL
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(symt_ptr);
-        }
+        unsafe { drop(Box::from_raw(symt_ptr)) }
         Ok(())
     })
 }
diff --git a/rustfst-ffi/src/tr.rs b/rustfst-ffi/src/tr.rs
@@ -149,9 +149,7 @@ pub extern "C" fn tr_delete(tr_ptr: *mut CTr) -> RUSTFST_FFI_RESULT {
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(tr_ptr);
-        }
+        unsafe { drop(Box::from_raw(tr_ptr)) }
         Ok(())
     })
 }
diff --git a/rustfst-ffi/src/trs.rs b/rustfst-ffi/src/trs.rs
@@ -91,9 +91,7 @@ pub extern "C" fn trs_vec_delete(trs_ptr: *mut CTrs) -> RUSTFST_FFI_RESULT {
             return Ok(());
         }
 
-        unsafe {
-            Box::from_raw(trs_ptr);
-        }
+        unsafe { drop(Box::from_raw(trs_ptr)) }
         Ok(())
     })
 }