[tor-commits] [tor/master] [rust] Add "unsafe" to the testing-mode tor_malloc_ wrapper.

[nickm@xxxxxxxxxxxxxx]

commit 1e66ab363a561c3b419269eca8f7e92346718075
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Oct 27 12:49:51 2017 -0400

    [rust] Add "unsafe" to the testing-mode tor_malloc_ wrapper.
    
    This change lets us remove the allow(unused_unsafe) directive
    from allocate_and_copy_string().
---
 src/rust/tor_allocate/tor_allocate.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/rust/tor_allocate/tor_allocate.rs b/src/rust/tor_allocate/tor_allocate.rs
index 8a6fabe9c..359df1cd7 100644
--- a/src/rust/tor_allocate/tor_allocate.rs
+++ b/src/rust/tor_allocate/tor_allocate.rs
@@ -12,9 +12,9 @@ extern "C" {
 // Defined only for tests, used for testing purposes, so that we don't need
 // to link to tor C files. Uses the system allocator
 #[cfg(test)]
-extern "C" fn tor_malloc_(size: usize) -> *mut c_void {
+unsafe extern "C" fn tor_malloc_(size: usize) -> *mut c_void {
     use libc::malloc;
-    unsafe { malloc(size) }
+    malloc(size)
 }
 
 /// Allocate memory using tor_malloc_ and copy an existing string into the
@@ -28,10 +28,6 @@ extern "C" fn tor_malloc_(size: usize) -> *mut c_void {
 ///
 /// A `*mut c_char` that should be freed by tor_free in C
 ///
-/// Allow unused unsafe as at compile-time, we get warnings that unsafe is not
-/// needed even though this calls tor_malloc in C.
-///
-#[allow(unused_unsafe)]
 pub fn allocate_and_copy_string(src: &String) -> *mut c_char {
     let bytes: &[u8] = src.as_bytes();
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits