Use JSTraceable everywhere

1 files changed, 4 insertions, 13 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index f73ccbb10fe..14acae9bfa2 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2754,7 +2754,8 @@ use js::jsapi::JSContext;
 use js::jsval::JSVal;
 
 #[repr(uint)]
-#[deriving(Encodable, PartialEq)]
+#[deriving(PartialEq)]
+#[jstraceable]
 pub enum valuelist {
   %s
 }
@@ -4893,7 +4894,7 @@ class CGCallback(CGClass):
                          bases=[ClassBase(baseName)],
                          constructors=self.getConstructors(),
                          methods=realMethods+getters+setters,
-                         decorators="#[deriving(PartialEq,Clone,Encodable)]")
+                         decorators="#[deriving(PartialEq,Clone)]#[jstraceable]")
 
     def getConstructors(self):
         return [ClassConstructor(
@@ -5438,7 +5439,6 @@ class GlobalGenRoots():
                      CGGeneric("use dom::bindings::js::{JS, JSRef, Temporary};\n"),
                      CGGeneric("use dom::bindings::trace::JSTraceable;\n"),
                      CGGeneric("use dom::bindings::utils::Reflectable;\n"),
-                     CGGeneric("use serialize::{Encodable, Encoder};\n"),
                      CGGeneric("use js::jsapi::JSTracer;\n\n")]
         for descriptor in descriptors:
             name = descriptor.name
@@ -5500,16 +5500,7 @@ class GlobalGenRoots():
                  'toBound': name + 'Derived'})),
                     CGGeneric("impl %s for %s {}\n\n" % (name + 'Cast', name))]
 
-            trace = [CGGeneric(string.Template('''impl JSTraceable for ${name} {
-    fn trace(&self, tracer: *mut JSTracer) {
-        unsafe {
-            self.encode(&mut *tracer).ok().expect("failed to encode");
-        }
-    }
-}
-''').substitute({'name': name}))]
-
-            allprotos += protos + derived + cast + trace
+            allprotos += protos + derived + cast
 
         curr = CGList(allprotos)
         curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT)