Auto merge of #7283 - Ms2ger:create_shareable, r=larsbergstrom

Cleanup ActorRegistry::create_shareable.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7283)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-19 07:30:57 -06:00
commit 1fd5418f43

View file

@ -110,16 +110,18 @@ impl ActorRegistry {
} }
/// Creating shareable registry /// Creating shareable registry
pub fn create_shareable(self) -> Arc<Mutex<ActorRegistry>>{ pub fn create_shareable(self) -> Arc<Mutex<ActorRegistry>> {
if self.shareable.is_some() { if let Some(shareable) = self.shareable {
return self.shareable.unwrap(); return shareable;
} }
let shareable = Arc::new(Mutex::new(self)); let shareable = Arc::new(Mutex::new(self));
let mut lock = shareable.lock(); {
let registry = lock.as_mut().unwrap(); let mut lock = shareable.lock();
registry.shareable = Some(shareable.clone()); let registry = lock.as_mut().unwrap();
shareable.clone() registry.shareable = Some(shareable.clone());
}
shareable
} }
/// Get shareable registry through threads /// Get shareable registry through threads