Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Resolves merge conflict without wonky cloning

Browse source
This commit is contained in:
Sam Gibson 2015-08-31 08:54:12 +12:00
parent 4b6f07cbe6
commit 9d0f418ee0
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/http_loader.rs
View file

@ -40,11 +40,9 @@ use uuid;
pub fn factory(resource_mgr_chan: IpcSender<ControlMsg>, pub fn factory(resource_mgr_chan: IpcSender<ControlMsg>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>) devtools_chan: Option<Sender<DevtoolsControlMsg>>)
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> { -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {
box move |load_data, senders, classifier| { box move |load_data: LoadData, senders, classifier| {
let l: LoadData = (load_data as LoadData).clone(); spawn_named(format!("http_loader for {}", load_data.url.serialize()),
let name = format!("http_loader for {}", l.url.serialize()); move || load_for_consumer(load_data, senders, classifier, resource_mgr_chan, devtools_chan))
spawn_named(name,
move || load_for_consumer(l, senders, classifier, resource_mgr_chan, devtools_chan))
} }
} }