aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/utils.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2014-06-06 14:10:41 +0200
committerMs2ger <ms2ger@gmail.com>2014-06-06 14:10:41 +0200
commitba68203ebf5117b56cb2e67b220a8549591421eb (patch)
treeba9eeaea05b4af2ca07659c69f70c4f9bb7a6e2c /src/components/script/dom/bindings/utils.rs
parent0c54cd1634c54429f25953a62dcd6c56680ae3b3 (diff)
downloadservo-ba68203ebf5117b56cb2e67b220a8549591421eb.tar.gz
servo-ba68203ebf5117b56cb2e67b220a8549591421eb.zip
Remove the pointless terminator from ConstantSpec slices.
Diffstat (limited to 'src/components/script/dom/bindings/utils.rs')
-rw-r--r--src/components/script/dom/bindings/utils.rs19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index c7020823273..f6e9a1e1ba6 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -312,10 +312,8 @@ fn CreateInterfaceObject(cx: *mut JSContext, global: *mut JSObject, receiver: *m
}
fn DefineConstants(cx: *mut JSContext, obj: *mut JSObject, constants: &'static [ConstantSpec]) -> bool {
- for spec in constants.iter() {
- if spec.name.is_null() {
- return true;
- }
+ constants.iter().all(|spec| {
+ assert!(spec.name.is_not_null());
let jsval = match spec.value {
NullVal => NullValue(),
IntVal(i) => Int32Value(i),
@@ -325,16 +323,11 @@ fn DefineConstants(cx: *mut JSContext, obj: *mut JSObject, constants: &'static [
VoidVal => UndefinedValue(),
};
unsafe {
- if JS_DefineProperty(cx, obj, spec.name,
- jsval, None,
- None,
- JSPROP_ENUMERATE | JSPROP_READONLY |
- JSPROP_PERMANENT) == 0 {
- return false;
- }
+ JS_DefineProperty(cx, obj, spec.name, jsval, None, None,
+ JSPROP_ENUMERATE | JSPROP_READONLY |
+ JSPROP_PERMANENT) != 0
}
- }
- fail!();
+ })
}
fn DefineMethods(cx: *mut JSContext, obj: *mut JSObject, methods: &'static [JSFunctionSpec]) -> bool {