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

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 -->

1 files changed, 4 insertions, 5 deletions

diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index 22c82af3259..63a5a82a46c 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -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)),
+        }
     }
 }