Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6811 - Ms2ger:auto-worker, r=jdm

Browse source 
Simplify AutoWorkerReset::new.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6811)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-29 07:54:08 -06:00
commit e74a13c01d
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -43,6 +43,7 @@ use js::rust::Runtime;
use url::Url;
use rand::random;
use std::mem::replace;
use std::rc::Rc;
use std::sync::mpsc::{Sender, Receiver, channel};
@ -79,12 +80,10 @@ struct AutoWorkerReset<'a> {
impl<'a> AutoWorkerReset<'a> {
fn new(workerscope: &'a DedicatedWorkerGlobalScope, worker: TrustedWorkerAddress) -> AutoWorkerReset<'a> {
let reset = AutoWorkerReset {
AutoWorkerReset {
workerscope: workerscope,
old_worker: workerscope.worker.borrow().clone()
};
*workerscope.worker.borrow_mut() = Some(worker);
reset
old_worker: replace(&mut *workerscope.worker.borrow_mut(), Some(worker)),
}
}
}