perform clippy and fmt

Author: Ryan Clanton

libmimalloc-sys/build.rs

@@ -111,27 +111,20 @@ fn main() {
         }
     } else if target_env == "gnu" {
         cfg = cfg.define("CMAKE_SH", "CMAKE_SH-NOTFOUND");
-        // cc::get_compiler have /nologo /MD default flags that are cmake::Config
-        // defaults to. Those flags prevents mimalloc from building on windows
-        // extracted from default cmake configuration on windows
+        //  Those flags prevents mimalloc from building on windows
         if is_debug {
             // CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG
-            cfg = cfg.cflag("-static -ffunction-sections -fdata-sections -m64 -O3 -fpic");
+            cfg = cfg.cflag("-static -ffunction-sections -fdata-sections -m64 -O2 -fpic");
         } else {
             // CMAKE_C_FLAGS + CMAKE_C_FLAGS_RELEASE
             cfg = cfg.cflag("-static -ffunction-sections -fdata-sections -m64 -O3 -fpic");
         }
     };
 
     let mut out_dir = "./build".to_string();
-    if cfg!(all(windows, target_env = "msvc")) {
-        if target_env == "msvc" {
-            out_dir.push('/');
-            out_dir.push_str(win_folder);
-        } else if target_env == "gnu" {
-            out_dir.push('/');
-            out_dir.push_str(win_folder);
-        }
+    if cfg!(all(windows)) {
+        out_dir.push('/');
+        out_dir.push_str(win_folder);
     }
     let out_name = if cfg!(all(windows)) {
         if is_debug {
@@ -140,27 +133,21 @@ fn main() {
             } else {
                 "mimalloc-static-debug"
             }
+        } else if cfg!(feature = "secure") {
+            "mimalloc-static-secure"
         } else {
-            if cfg!(feature = "secure") {
-                "mimalloc-static-secure"
-            } else {
-                "mimalloc-static"
-            }
+            "mimalloc-static"
         }
-    } else {
-        if is_debug {
-            if cfg!(feature = "secure") {
-                "mimalloc-secure-debug"
-            } else {
-                "mimalloc-debug"
-            }
+    } else if is_debug {
+        if cfg!(feature = "secure") {
+            "mimalloc-secure-debug"
         } else {
-            if cfg!(feature = "secure") {
-                "mimalloc-secure"
-            } else {
-                "mimalloc"
-            }
+            "mimalloc-debug"
         }
+    } else if cfg!(feature = "secure") {
+        "mimalloc-secure"
+    } else {
+        "mimalloc"
     };
 
     // Build mimalloc-static

libmimalloc-sys/c_src/mimalloc

@@ -20,13 +20,6 @@ extern "C" {
     /// Returns a unique pointer if called with `size` 0.
     pub fn mi_malloc(size: usize) -> *mut c_void;
 
-    /// Allocate `count` items of `size` length each.
-    ///
-    /// Returns `null` if `count * size` overflows or on out-of-memory.
-    ///
-    /// All items are initialized to zero.
-    pub fn mi_calloc(count: usize, size: usize) -> *mut c_void;
-
     /// Re-allocate memory to `newsize` bytes.
     ///
     /// Return pointer to the allocated memory or null if out of memory. If null