aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Gibson <sam@ifdown.net>2015-08-31 08:54:12 +1200
committerSam Gibson <sam@ifdown.net>2015-08-31 08:54:12 +1200
commit9d0f418ee05b86399ce11ee0cbe0423a8f40ee9e (patch)
treeb6571b992354e3b5a41fa53faade22fb560c72ae
parent4b6f07cbe65654eeac510f718eba3a9530899e91 (diff)
downloadservo-9d0f418ee05b86399ce11ee0cbe0423a8f40ee9e.tar.gz
servo-9d0f418ee05b86399ce11ee0cbe0423a8f40ee9e.zip
Resolves merge conflict without wonky cloning
-rw-r--r--components/net/http_loader.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 0d5b819b9a6..8f0700853fd 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -40,11 +40,9 @@ use uuid;
pub fn factory(resource_mgr_chan: IpcSender<ControlMsg>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>)
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {
- box move |load_data, senders, classifier| {
- let l: LoadData = (load_data as LoadData).clone();
- let name = format!("http_loader for {}", l.url.serialize());
- spawn_named(name,
- move || load_for_consumer(l, senders, classifier, resource_mgr_chan, devtools_chan))
+ box move |load_data: LoadData, senders, classifier| {
+ spawn_named(format!("http_loader for {}", load_data.url.serialize()),
+ move || load_for_consumer(load_data, senders, classifier, resource_mgr_chan, devtools_chan))
}
}