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/worker.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/worker.rs')
-rw-r--r-- | components/script/dom/worker.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index af7302a1671..a0d8f4685cd 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -89,7 +89,7 @@ impl Worker { assert!(JS_ReadStructuredClone( global.root_ref().get_cx(), data as *const u64, nbytes, JS_STRUCTURED_CLONE_VERSION, &mut message, - ptr::null(), ptr::mut_null()) != 0); + ptr::null(), ptr::null_mut()) != 0); } let target: JSRef<EventTarget> = EventTargetCast::from_ref(*worker); @@ -131,11 +131,11 @@ impl Worker { impl<'a> WorkerMethods for JSRef<'a, Worker> { fn PostMessage(self, cx: *mut JSContext, message: JSVal) { - let mut data = ptr::mut_null(); + let mut data = ptr::null_mut(); let mut nbytes = 0; unsafe { assert!(JS_WriteStructuredClone(cx, message, &mut data, &mut nbytes, - ptr::null(), ptr::mut_null()) != 0); + ptr::null(), ptr::null_mut()) != 0); } self.addref(); |