aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/bindings/structuredclone.rs6
-rw-r--r--components/script/dom/worker.rs5
-rw-r--r--components/script/dom/xmlhttprequest.rs5
-rw-r--r--components/script/script_task.rs4
4 files changed, 10 insertions, 10 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);
}
}
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 4783d8539f4..46488446b9d 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -96,7 +96,7 @@ pub enum TimerSource {
}
pub trait Runnable {
- fn handler(&self);
+ fn handler(self: Box<Self>);
}
/// Messages used to control script event loops, such as ScriptTask and
@@ -1385,7 +1385,7 @@ impl DocumentProgressHandler {
}
impl Runnable for DocumentProgressHandler {
- fn handler(&self) {
+ fn handler(self: Box<DocumentProgressHandler>) {
match self.task {
DocumentProgressTask::DOMContentLoaded => {
self.dispatch_dom_content_loaded();