aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xmldocument.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-31 04:10:42 -0500
committerGitHub <noreply@github.com>2016-08-31 04:10:42 -0500
commit3649a356c8ddd04d3beebff9978b1bffa407c307 (patch)
tree45a29e22d90107d905317674ed0b35aaa04f87db /components/script/dom/xmldocument.rs
parentacb47007ba9494c73272494efe9ebd2c05e4c014 (diff)
parent7dfb336be8dae1e2be9b898c374b6715e2a00ac7 (diff)
downloadservo-3649a356c8ddd04d3beebff9978b1bffa407c307.tar.gz
servo-3649a356c8ddd04d3beebff9978b1bffa407c307.zip
Auto merge of #13100 - nox:better-getters, r=Ms2ger
Use Option<T> to return from getters <!-- 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/13100) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/xmldocument.rs')
-rw-r--r--components/script/dom/xmldocument.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/xmldocument.rs b/components/script/dom/xmldocument.rs
index 5f6b6e1919c..1a00f67b80c 100644
--- a/components/script/dom/xmldocument.rs
+++ b/components/script/dom/xmldocument.rs
@@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+use core::nonzero::NonZero;
use document_loader::DocumentLoader;
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::codegen::Bindings::XMLDocumentBinding::{self, XMLDocumentMethods};
@@ -87,7 +88,7 @@ impl XMLDocumentMethods for XMLDocument {
}
// https://html.spec.whatwg.org/multipage/#dom-tree-accessors:dom-document-nameditem-filter
- fn NamedGetter(&self, _cx: *mut JSContext, name: DOMString, found: &mut bool) -> *mut JSObject {
- self.upcast::<Document>().NamedGetter(_cx, name, found)
+ fn NamedGetter(&self, _cx: *mut JSContext, name: DOMString) -> Option<NonZero<*mut JSObject>> {
+ self.upcast::<Document>().NamedGetter(_cx, name)
}
}