mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Use throw_type_error and throw_range_error from js.
This commit is contained in:
parent
ddaa1a1960
commit
acb24e80b8
5 changed files with 24 additions and 92 deletions
|
@ -32,7 +32,6 @@
|
|||
//! | sequences | `Vec<T>` |
|
||||
//! | union types | `T` |
|
||||
|
||||
use dom::bindings::error::throw_type_error;
|
||||
use dom::bindings::inheritance::Castable;
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::num::Finite;
|
||||
|
@ -40,6 +39,7 @@ use dom::bindings::reflector::{Reflectable, Reflector};
|
|||
use dom::bindings::str::{ByteString, USVString};
|
||||
use dom::bindings::utils::DOMClass;
|
||||
use js;
|
||||
use js::error::throw_type_error;
|
||||
use js::glue::{GetProxyPrivate, IsWrapper, RUST_JS_NumberValue};
|
||||
use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject};
|
||||
use js::jsapi::{HandleId, HandleObject, HandleValue, JS_GetClass};
|
||||
|
@ -146,7 +146,7 @@ fn enforce_range<D>(cx: *mut JSContext, d: f64) -> Result<D, ()>
|
|||
f64: As<D>
|
||||
{
|
||||
if d.is_infinite() {
|
||||
throw_type_error(cx, "value out of range in an EnforceRange argument");
|
||||
unsafe { throw_type_error(cx, "value out of range in an EnforceRange argument") };
|
||||
return Err(());
|
||||
}
|
||||
|
||||
|
@ -154,7 +154,7 @@ fn enforce_range<D>(cx: *mut JSContext, d: f64) -> Result<D, ()>
|
|||
if D::min_value().cast() <= rounded && rounded <= D::max_value().cast() {
|
||||
Ok(rounded.cast())
|
||||
} else {
|
||||
throw_type_error(cx, "value out of range in an EnforceRange argument");
|
||||
unsafe { throw_type_error(cx, "value out of range in an EnforceRange argument") };
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
@ -408,7 +408,7 @@ impl<T: Float + FromJSValConvertible<Config=()>> FromJSValConvertible for Finite
|
|||
match Finite::new(result) {
|
||||
Some(v) => Ok(v),
|
||||
None => {
|
||||
throw_type_error(cx, "this argument is not a finite floating-point value");
|
||||
unsafe { throw_type_error(cx, "this argument is not a finite floating-point value") };
|
||||
Err(())
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue