diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-10-09 23:22:59 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-10-09 23:22:59 -0600 |
| commit | 9cccd98254191b1663dcaee9010eee63fa8074a3 (patch) | |
| tree | 5643b854c9e7d75138a562985492c3bec8bd64de /components/script/dom/bindings/codegen/CodegenRust.py | |
| parent | 1192efed505ca19a395f22cd5e5733e8c57a6e82 (diff) | |
| parent | 7301609c18105395467b94d75023d58188578a73 (diff) | |
| download | servo-9cccd98254191b1663dcaee9010eee63fa8074a3.tar.gz servo-9cccd98254191b1663dcaee9010eee63fa8074a3.zip | |
Auto merge of #7948 - kunitsyn:master, r=Manishearth
Changed dom_class type to Option<&'static DOMClass> to fix #7942
I have a feeling that converting `Option<&T>` to `*const libc::c_void` could be less explicit.
Was there any way to do it shorter?
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7948)
<!-- 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, 3 insertions, 3 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index b154bbdcf5a..8a66a99cb38 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2357,11 +2357,11 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod): if self.descriptor.concrete: if self.descriptor.proxy: - domClass = "&Class" + domClass = "Some(&Class)" else: - domClass = "&Class.dom_class" + domClass = "Some(&Class.dom_class)" else: - domClass = "ptr::null()" + domClass = "None" if self.descriptor.interface.hasInterfaceObject(): if self.descriptor.interface.ctor(): |