From 2bf60c2af7d2952be4698d812a04b8a127e5dd68 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Thu, 10 Nov 2016 19:55:45 +0100
Subject: [PATCH 1/4] Add an implementation of Default for Heap<*mut T>.

We should be able to create a default value for any Heap<*mut T> where *mut T implements
GCMethods<*mut T> and Copy, not just for Heap<*mut JSObject>.
---
 src/rust.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rust.rs b/src/rust.rs
index 20b4a3b7b..00aa51acd 100644
--- a/src/rust.rs
+++ b/src/rust.rs
@@ -556,8 +556,10 @@ impl<T: GCMethods<T> + Copy> Heap<T> {
     }
 }
 
-impl Default for Heap<*mut JSObject> {
-    fn default() -> Heap<*mut JSObject> {
+impl<T> Default for Heap<*mut T>
+    where *mut T: GCMethods<*mut T> + Copy
+{
+    fn default() -> Heap<*mut T> {
         Heap {
             ptr: UnsafeCell::new(ptr::null_mut())
         }

From e96ee0b2d6a2e12881c617e88ebf651b2e556dfb Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Thu, 10 Nov 2016 20:02:22 +0100
Subject: [PATCH 2/4] Add a method to create a Heap<T>.

Currently, to create a Heap<T>, one first has to create a Heap<T>::default, and then call
Heap<T>::set. This is a common pattern and therefore should be abstracted behind a method.
---
 src/rust.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rust.rs b/src/rust.rs
index 00aa51acd..4b09f420d 100644
--- a/src/rust.rs
+++ b/src/rust.rs
@@ -532,6 +532,14 @@ impl GCMethods<Value> for Value {
 }
 
 impl<T: GCMethods<T> + Copy> Heap<T> {
+    pub fn new(v: T) -> Heap<T>
+        where Heap<T>: Default
+    {
+        let mut ptr = Heap::default();
+        ptr.set(v);
+        ptr
+    }
+
     pub fn set(&mut self, v: T) {
         unsafe {
             let ptr = self.ptr.get();

From 330aa0822f9ddf2948b0fde37806ddfcd107a199 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Thu, 10 Nov 2016 20:08:06 +0100
Subject: [PATCH 3/4] Add an implementation of Clone for Heap<T>.

---
 src/rust.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rust.rs b/src/rust.rs
index 4b09f420d..e732feb7b 100644
--- a/src/rust.rs
+++ b/src/rust.rs
@@ -564,6 +564,14 @@ impl<T: GCMethods<T> + Copy> Heap<T> {
     }
 }
 
+impl<T: GCMethods<T> + Copy> Clone for Heap<T>
+    where Heap<T>: Default
+{
+    fn clone(&self) -> Self {
+        Heap::new(self.get())
+    }
+}
+
 impl<T> Default for Heap<*mut T>
     where *mut T: GCMethods<*mut T> + Copy
 {

From 07661517904ab3bd8fd5a8e5e3193c022f931d2b Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Thu, 10 Nov 2016 20:10:37 +0100
Subject: [PATCH 4/4] Add an implementation of PartialEq for Heap<T>.

---
 src/rust.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/rust.rs b/src/rust.rs
index e732feb7b..30878376a 100644
--- a/src/rust.rs
+++ b/src/rust.rs
@@ -599,6 +599,11 @@ impl<T: GCMethods<T> + Copy> Drop for Heap<T> {
     }
 }
 
+impl<T: GCMethods<T> + Copy + PartialEq> PartialEq for Heap<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.get() == other.get()
+    }
+}
 
 // ___________________________________________________________________________
 // Implementations for various things in jsapi.rs