Addition of V1 stableand dev options, as well as V2 dev option

Author: ryancinsight

.gitmodules

@@ -1,3 +1,11 @@
 [submodule "libmimalloc-sys/c_src/mimalloc"]
 	path = libmimalloc-sys/c_src/mimalloc
 	url = https://github.com/microsoft/mimalloc
+[submodule "libmimalloc-sys/c_src/mimalloc_dev_slice"]
+	path = libmimalloc-sys/c_src/mimalloc_dev_slice
+	url = https://github.com/microsoft/mimalloc.git
+	branch = dev-slice
+[submodule "libmimalloc-sys/c_src/mimalloc_dev"]
+	path = libmimalloc-sys/c_src/mimalloc_dev
+	url = https://github.com/microsoft/mimalloc.git
+	branch = dev

Cargo.toml

@@ -24,7 +24,10 @@ travis-ci = { repository = "purpleprotocol/mimalloc_rust" }
 libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.21", default-features = false }
 
 [features]
-default = ["secure"]
+default = ["secure","v1_stable"]
 secure = ["libmimalloc-sys/secure"]
 override = ["libmimalloc-sys/override"]
 local_dynamic_tls = ["libmimalloc-sys/local_dynamic_tls"]
+v1_stable = ["libmimalloc-sys/v1_stable"]
+v1_dev = ["libmimalloc-sys/v1_dev"]
+v2_dev = ["libmimalloc-sys/v2_dev"]

libmimalloc-sys/Cargo.toml

@@ -21,6 +21,10 @@ secure = []
 override = []
 extended = ["cty"]
 local_dynamic_tls = []
+v1_stable = []
+v1_dev = []
+v2_dev = []
+
 
 # Show `extended` on docs.rs since it's the full API surface.
 [package.metadata.docs.rs]

libmimalloc-sys/build.rs

@@ -3,27 +3,76 @@ use std::env;
 fn main() {
     let mut build = cc::Build::new();
 
-    build.include("c_src/mimalloc/include");
-    build.files(
-        [
-            "alloc-aligned",
-            "alloc-posix",
-            "alloc",
-            "arena",
-            "bitmap",
-            "heap",
-            "init",
-            "options",
-            "os",
-            "page",
-            "random",
-            "region",
-            "segment",
-            "stats",
-        ]
-        .iter()
-        .map(|fname| format!("c_src/mimalloc/src/{}.c", fname)),
-    );
+	if cfg!(feature = "v1_stable") {
+		build.include("c_src/mimalloc/include");
+		build.files(
+			[
+				"alloc-aligned",
+				"alloc-posix",
+				"alloc",
+				"arena",
+				"bitmap",
+				"heap",
+				"init",
+				"options",
+				"os",
+				"page",
+				"random",
+				"region",
+				"segment",
+				"stats",
+			]
+			.iter()
+			.map(|fname| format!("c_src/mimalloc/src/{}.c", fname)),
+		);
+	} else if cfg!(feature = "v1_dev") {
+		build.include("c_src/mimalloc_dev/include");
+		build.files(
+			[
+				"alloc-aligned",
+				"alloc-posix",
+				"alloc",
+				"arena",
+				"bitmap",
+				"heap",
+				"init",
+				"options",
+				"os",
+				"page",
+				"random",
+				"region",
+				"segment",
+				"stats",
+			]
+			.iter()
+			.map(|fname| format!("c_src/mimalloc_dev/src/{}.c", fname)),
+		);
+	} else if cfg!(feature = "v2_dev") {
+		build.include("c_src/mimalloc_dev_slice/include");
+		build.files(
+			[
+				"alloc-aligned",
+				"alloc-posix",
+				"alloc",
+				"arena",
+				"bitmap",
+				"heap",
+				"init",
+				"options",
+				"os",
+				"page",
+				"random",
+				"segment-cache",
+				"segment",
+				"stats",
+			]
+			.iter()
+			.map(|fname| format!("c_src/mimalloc_dev_slice/src/{}.c", fname)),
+		);
+	} else {
+		panic!("A mimalloc branch must be specified as one of features");
+	}
+
 
     build.define("MI_STATIC_LIB", None);