Merge pull request #284 from caido/ef-trace-improvements

Trace improvements

core/src/class/trace.rs

@@ -1,5 +1,8 @@
 use std::marker::PhantomData;
 
+#[cfg(feature = "either")]
+use either::{Either, Left, Right};
+
 use crate::{markers::Invariant, qjs, Class, Ctx, Value};
 
 use super::JsClass;
@@ -77,6 +80,32 @@ where
     }
 }
 
+impl<'js, T> Trace<'js> for Option<T>
+where
+    T: Trace<'js>,
+{
+    fn trace<'a>(&self, tracer: Tracer<'a, 'js>) {
+        if let Some(inner) = &self {
+            inner.trace(tracer);
+        }
+    }
+}
+
+#[cfg(feature = "either")]
+#[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "either")))]
+impl<'js, L, R> Trace<'js> for Either<L, R>
+where
+    L: Trace<'js>,
+    R: Trace<'js>,
+{
+    fn trace<'a>(&self, tracer: Tracer<'a, 'js>) {
+        match self {
+            Left(l) => l.trace(tracer),
+            Right(r) => r.trace(tracer),
+        }
+    }
+}
+
 macro_rules! trace_impls {
 
     (primitive: $( $(#[$meta:meta])* $($type:ident)::+$(<$lt:lifetime>)?,)*) => {

macro/src/lib.rs

@@ -55,6 +55,7 @@ mod trace;
 /// | `set`          | Flag      | Creates a setter for this field, allowing write access to the field from JavaSccript.   |
 /// | `enumerable`   | Flag      | Makes the field, if it has a getter or setter, enumerable in JavaScript.                |
 /// | `configurable` | Flag      | Makes the field, if it has a getter or setter, configurable in JavaScript.              |
+/// | `skip_trace`   | Flag      | Skips the field deriving the `Trace` trait.                                             |
 /// | `rename`       | String    | Changes the name of the field getter and/or setter to the specified name in JavaScript. |
 ///
 ///