aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-21 03:48:49 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-21 03:48:49 -0700
commit8df0ee2bb5d40e4b22db1666982e2e5ea36513f6 (patch)
tree6bed465dae6bda2340db62dec1c40f0fd1d77513 /components/script/dom
parent94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997 (diff)
parent808315926cf5fd49c26fcbbc4e2a2d281b3fca46 (diff)
downloadservo-8df0ee2bb5d40e4b22db1666982e2e5ea36513f6.tar.gz
servo-8df0ee2bb5d40e4b22db1666982e2e5ea36513f6.zip
auto merge of #4703 : servo/servo/task, r=saneyuki
IntoString has been removed from Rust, and named() will take a String, so there is no good reason to do otherwise here.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/xmlhttprequest.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 4572d3221c7..191d3cf6dde 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -257,7 +257,7 @@ impl XMLHttpRequest {
let req2 = req.clone();
// TODO: this exists only to make preflight check non-blocking
// perhaps should be handled by the resource_loader?
- spawn_named("XHR:Cors", proc() {
+ spawn_named("XHR:Cors".to_owned(), proc() {
let response = req2.http_fetch();
chan.send(response);
});
@@ -624,7 +624,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
// inflight events queued up in the script task's port.
let addr = Trusted::new(self.global.root().r().get_cx(), self,
script_chan.clone());
- spawn_named("XHRTask", proc() {
+ spawn_named("XHRTask".to_owned(), proc() {
let _ = XMLHttpRequest::fetch(&mut SyncOrAsync::Async(addr, script_chan),
resource_task,
load_data,
@@ -936,7 +936,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
let oneshot = self.timer.borrow_mut()
.oneshot(Duration::milliseconds(timeout as i64));
let terminate_sender = (*self.terminate_sender.borrow()).clone();
- spawn_named("XHR:Timer", proc () {
+ spawn_named("XHR:Timer".to_owned(), proc () {
match oneshot.recv_opt() {
Ok(_) => {
terminate_sender.map(|s| s.send_opt(TerminateReason::TimedOut));