diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-10 10:30:44 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-10 10:30:44 -0700 |
commit | 879af966b3c18d9405b6f5837b39a28039db1eb3 (patch) | |
tree | 0a08fde402fb0ac5a58cc33c0431bf7441bfb9a2 /components/script/dom | |
parent | e17d390714c576f4a0667c2c431ab6da84c6eb4d (diff) | |
parent | 01444022b0e4d48fbbff6f078d76e382c4aa5a22 (diff) | |
download | servo-879af966b3c18d9405b6f5837b39a28039db1eb3.tar.gz servo-879af966b3c18d9405b6f5837b39a28039db1eb3.zip |
auto merge of #4609 : Ms2ger/servo/runnable-self-by-value, r=jdm
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/structuredclone.rs | 6 | ||||
-rw-r--r-- | components/script/dom/worker.rs | 5 | ||||
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index 843b7bea30c..f426c6f4677 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -15,11 +15,9 @@ use js::jsval::{JSVal, UndefinedValue}; use libc::size_t; use std::ptr; -#[allow(raw_pointer_deriving)] -#[deriving(Copy)] pub struct StructuredCloneData { - pub data: *mut u64, - pub nbytes: size_t, + data: *mut u64, + nbytes: size_t, } impl StructuredCloneData { diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 3822e4e538c..8fa36436c19 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -115,7 +115,8 @@ impl WorkerMessageHandler { } impl Runnable for WorkerMessageHandler { - fn handler(&self){ - Worker::handle_message(self.addr.clone(), self.data); + fn handler(self: Box<WorkerMessageHandler>) { + let this = *self; + Worker::handle_message(this.addr, this.data); } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index beee21798af..a5d5c767a72 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -85,8 +85,9 @@ impl XHRProgressHandler { } impl Runnable for XHRProgressHandler { - fn handler(&self) { - XMLHttpRequest::handle_progress(self.addr.clone(), self.progress.clone()); + fn handler(self: Box<XHRProgressHandler>) { + let this = *self; + XMLHttpRequest::handle_progress(this.addr, this.progress); } } |