Merge pull request #194 from lumen/gc/tests

Fixes and improvements to term/alloc implementation

Author: KronicDeth

Cargo.lock

@@ -5,13 +5,18 @@ authors = ["Paul Schoenfelder <paulschoenfelder@gmail.com>"]
 publish = false
 edition = "2018"
 
+[features]
+# Turns on allocation instrumentation
+instrument = []
+
 [dependencies]
 log = "0.4"
 cfg-if = "0.1"
 lazy_static = "1.2"
 num-traits = "0.2"
 num-bigint = "0.2"
 thread_local = "0.3"
+heapless = { git = "https://github.com/japaric/heapless" }
 liblumen_core = { path = "../liblumen_core" }
 liblumen_arena = { path = "../liblumen_arena"}
 liblumen_alloc_macros = { path = "../liblumen_alloc_macros" }
@@ -26,13 +31,12 @@ features = ["nightly"]
 version = "0.7"
 features = ["nightly"]
 
+[dependencies.static_assertions]
+version = "0.3"
+features = ["nightly"]
+
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2"
 
 [dev-dependencies]
 pretty_assertions = "0.6"
-quickcheck_macros = "0.8"
-
-[dev-dependencies.quickcheck]
-version = "0.8"
-features = ["unstable"]

liblumen_alloc/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::erts::{ProcessControlBlock, Term};
+use crate::erts::{AllocInProcess, Term};
 
 /// This trait represents cloning, like `Clone`, but specifically
 /// in the context of terms which need to be cloned into the heap
@@ -14,8 +14,8 @@ use crate::erts::{ProcessControlBlock, Term};
 /// NOTE: You can implement both `CloneInProcess` and `Clone` for a type,
 /// just be aware that any uses of `Clone` will allocate on the global heap
 pub trait CloneToProcess {
-    /// Returns a copy of this value, performing any heap allocations
+    /// Returns boxed copy of this value, performing any heap allocations
     /// using the process heap of `process`, or using heap fragments if
     /// there is not enough space for the cloned value
-    fn clone_to_process(&self, process: &mut ProcessControlBlock) -> Term;
+    fn clone_to_process<A: AllocInProcess>(&self, process: &mut A) -> Term;
 }

liblumen_alloc/src/borrow/clone_to_process.rs

@@ -38,7 +38,7 @@ impl RawFragment {
 
     /// Returns true if the given pointer is contained within this fragment
     #[inline]
-    pub fn contains(&self, ptr: *const Term) -> bool {
+    pub fn contains<T>(&self, ptr: *const T) -> bool {
         let ptr = ptr as usize;
         let start = self.data as usize;
         let end = unsafe { self.data.offset(self.size as isize) } as usize;
@@ -68,7 +68,7 @@ impl HeapFragment {
 
     /// Returns true if the given pointer is contained within this fragment
     #[inline]
-    pub fn contains(&self, ptr: *const Term) -> bool {
+    pub fn contains<T>(&self, ptr: *const T) -> bool {
         self.raw.contains(ptr)
     }