From a6c956f3122fdcdd5b1c02a4745260af9a264a2d Mon Sep 17 00:00:00 2001 From: Octavian Oncescu Date: Wed, 12 Feb 2020 17:39:36 +0000 Subject: [PATCH] Removed libc dependency --- Cargo.toml | 1 - libmimalloc-sys/Cargo.toml | 1 - libmimalloc-sys/src/lib.rs | 14 +++++++------- src/lib.rs | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 72c7650..b301726 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ members = ["libmimalloc-sys" ] travis-ci = { repository = "purpleprotocol/mimalloc_rust" } [dependencies] -libc = "0.2" libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.10" } [features] diff --git a/libmimalloc-sys/Cargo.toml b/libmimalloc-sys/Cargo.toml index 97d3ddf..393589e 100644 --- a/libmimalloc-sys/Cargo.toml +++ b/libmimalloc-sys/Cargo.toml @@ -10,7 +10,6 @@ description = "Sys crate wrapping the mimalloc allocator" license = "MIT" [dependencies] -libc = "0.2" [build-dependencies] cmake = "0.1" diff --git a/libmimalloc-sys/src/lib.rs b/libmimalloc-sys/src/lib.rs index e071449..4fb4249 100644 --- a/libmimalloc-sys/src/lib.rs +++ b/libmimalloc-sys/src/lib.rs @@ -1,14 +1,14 @@ // Copyright 2019 Octavian Oncescu -use libc::{c_void, size_t}; +use core::ffi::c_void; extern "C" { - pub fn mi_zalloc(size: size_t) -> *const c_void; - pub fn mi_malloc(size: size_t) -> *const c_void; - pub fn mi_realloc(p: *const c_void, size: size_t) -> *const c_void; - pub fn mi_zalloc_aligned(size: size_t, alignment: size_t) -> *const c_void; - pub fn mi_malloc_aligned(size: size_t, alignment: size_t) -> *const c_void; - pub fn mi_realloc_aligned(p: *const c_void, size: size_t, alignment: size_t) -> *const c_void; + pub fn mi_zalloc(size: usize) -> *const c_void; + pub fn mi_malloc(size: usize) -> *const c_void; + pub fn mi_realloc(p: *const c_void, size: usize) -> *const c_void; + pub fn mi_zalloc_aligned(size: usize, alignment: usize) -> *const c_void; + pub fn mi_malloc_aligned(size: usize, alignment: usize) -> *const c_void; + pub fn mi_realloc_aligned(p: *const c_void, size: usize, alignment: usize) -> *const c_void; pub fn mi_free(p: *const c_void) -> c_void; } diff --git a/src/lib.rs b/src/lib.rs index b2d90b3..cb5232c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,7 +27,7 @@ extern crate libmimalloc_sys as ffi; use core::alloc::{GlobalAlloc, Layout}; use ffi::*; -use libc::c_void; +use core::ffi::c_void; // Copied from https://github.com/rust-lang/rust/blob/master/src/libstd/sys_common/alloc.rs #[cfg(all(any(