diff options
| author | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
|---|---|---|
| committer | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
| commit | 045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch) | |
| tree | 1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /components/script/dom/bindings/error.rs | |
| parent | d6ba37c68c34a3748a789caeca225083275757e5 (diff) | |
| parent | a40b94d7f946d75e1a66af206efda9879b89c707 (diff) | |
| download | servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip | |
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'components/script/dom/bindings/error.rs')
| -rw-r--r-- | components/script/dom/bindings/error.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs index cb39e4f0755..e2e06d8205a 100644 --- a/components/script/dom/bindings/error.rs +++ b/components/script/dom/bindings/error.rs @@ -97,7 +97,7 @@ static ERROR_FORMAT_STRING: JSErrorFormatString = JSErrorFormatString { }; /// Callback used to throw `TypeError`s. -extern fn get_error_message(_user_ref: *mut libc::c_void, +unsafe extern fn get_error_message(_user_ref: *mut libc::c_void, _locale: *const libc::c_char, error_number: libc::c_uint) -> *const JSErrorFormatString { @@ -109,6 +109,6 @@ extern fn get_error_message(_user_ref: *mut libc::c_void, pub fn throw_type_error(cx: *mut JSContext, error: &str) { let error = error.to_c_str(); unsafe { - JS_ReportErrorNumber(cx, Some(get_error_message), ptr::mut_null(), 0, error.as_ptr()); + JS_ReportErrorNumber(cx, Some(get_error_message), ptr::null_mut(), 0, error.as_ptr()); } } |