diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-19 05:56:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-19 05:56:01 -0800 |
| commit | 28698dc8ba0501d3c7783e46ad3201cab5730d0b (patch) | |
| tree | e181761551444fb4af4e0b655376758c1ceb4524 /components/script/dom/bindings/codegen/CodegenRust.py | |
| parent | d2ae3d8bedf99c97877ec944d94f2aa72e67478d (diff) | |
| parent | fb8eb1db650e0902ee6909b4142c0e942a12943d (diff) | |
| download | servo-28698dc8ba0501d3c7783e46ad3201cab5730d0b.tar.gz servo-28698dc8ba0501d3c7783e46ad3201cab5730d0b.zip | |
Auto merge of #15589 - servo:RootedTraceable-union, r=nox
Use RootedTraceableBox for unions.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15589)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index b184cce76b2..73dfb4294f1 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -722,6 +722,9 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, if type.nullable(): declType = CGWrapper(declType, pre="Option<", post=" >") + if isMember != "Dictionary" and type_needs_tracing(type): + declType = CGTemplatedType("RootedTraceableBox", declType) + templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" " Ok(ConversionResult::Success(value)) => value,\n" " Ok(ConversionResult::Failure(error)) => {\n" @@ -6196,6 +6199,9 @@ def type_needs_tracing(t): if t.isSequence(): return type_needs_tracing(t.inner) + if t.isUnion(): + return any(type_needs_tracing(member) for member in t.flatMemberTypes) + return False if t.isDictionary(): |