aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-09-04 09:11:04 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-09-04 09:13:48 +0530
commite94df1ed5c3ccf76cd616e1146e2944f852477ac (patch)
treed112409360efa1979fca5c2902aecdfa18e684c0 /components/script/dom/bindings
parent2e02ea38fca44aaa5fe23e524bf27f667b300ada (diff)
downloadservo-e94df1ed5c3ccf76cd616e1146e2944f852477ac.tar.gz
servo-e94df1ed5c3ccf76cd616e1146e2944f852477ac.zip
Remove needless returns
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r--components/script/dom/bindings/conversions.rs2
-rw-r--r--components/script/dom/bindings/proxyhandler.rs6
-rw-r--r--components/script/dom/bindings/utils.rs14
3 files changed, 11 insertions, 11 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 46e9d908ac3..35f7be92b94 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -661,7 +661,7 @@ unsafe fn get_dom_class(obj: *mut JSObject) -> Result<DOMClass, ()> {
return Ok(*dom_class);
}
debug!("not a dom object");
- return Err(());
+ Err(())
}
/// Get a `*const libc::c_void` for the given DOM object, unwrapping any
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 2dde7370442..66240df0d2c 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -87,14 +87,14 @@ pub unsafe extern fn prevent_extensions(_cx: *mut JSContext,
_proxy: HandleObject,
result: *mut ObjectOpResult) -> u8 {
(*result).code_ = JSErrNum::JSMSG_CANT_PREVENT_EXTENSIONS as u32;
- return JSTrue;
+ JSTrue
}
/// Reports whether the object is Extensible
pub unsafe extern fn is_extensible(_cx: *mut JSContext, _proxy: HandleObject,
succeeded: *mut u8) -> u8 {
*succeeded = JSTrue;
- return JSTrue;
+ JSTrue
}
/// Get the expando object, or null if there is none.
@@ -123,7 +123,7 @@ pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject)
SetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO, ObjectValue(&*expando));
}
- return expando;
+ expando
}
}
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 7e4d8645f96..08e8fde7225 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -381,7 +381,7 @@ fn create_interface_prototype_object(cx: *mut JSContext, global: HandleObject,
pub unsafe extern fn throwing_constructor(cx: *mut JSContext, _argc: c_uint,
_vp: *mut JSVal) -> u8 {
throw_type_error(cx, "Illegal constructor.");
- return 0;
+ 0
}
/// An array of *mut JSObject of size PrototypeList::ID::Count
@@ -507,7 +507,7 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Option<u32>
if RUST_JSID_IS_INT(id) != 0 {
return Some(RUST_JSID_TO_INT(id) as u32);
}
- return None;
+ None
}
// if id is length atom, -1, otherwise
/*return if JSID_IS_ATOM(id) {
@@ -559,7 +559,7 @@ pub fn is_platform_object(obj: *mut JSObject) -> bool {
clasp = js::jsapi::JS_GetClass(obj);
}
// TODO also check if JS_IsArrayBufferObject
- return is_dom_class(&*clasp);
+ is_dom_class(&*clasp)
}
}
@@ -631,8 +631,8 @@ pub fn has_property_on_prototype(cx: *mut JSContext, proxy: HandleObject,
id: HandleId) -> bool {
// MOZ_ASSERT(js::IsProxy(proxy) && js::GetProxyHandler(proxy) == handler);
let mut found = false;
- return !get_property_on_prototype(cx, proxy, id, &mut found,
- MutableHandleValue { ptr: ptr::null_mut() }) || found;
+ !get_property_on_prototype(cx, proxy, id, &mut found,
+ MutableHandleValue { ptr: ptr::null_mut() }) || found
}
/// Create a DOM global object with the given class.
@@ -812,11 +812,11 @@ pub fn validate_qualified_name(qualified_name: &str) -> ErrorResult {
match xml_name_type(qualified_name) {
XMLName::InvalidXMLName => {
// Step 1.
- return Err(Error::InvalidCharacter);
+ Err(Error::InvalidCharacter)
},
XMLName::Name => {
// Step 2.
- return Err(Error::Namespace);
+ Err(Error::Namespace)
},
XMLName::QName => Ok(())
}