aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/layout_wrapper.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-12 04:49:22 -0500
committerGitHub <noreply@github.com>2016-10-12 04:49:22 -0500
commit494a89c27f302c47dff3c95c1a152219ad0463f7 (patch)
treedb103ad763b2e2765c756149079d8d48f2f94768 /components/script/layout_wrapper.rs
parentcd2f950de3bcbf88208dec16f7025ff516473e0d (diff)
parentd8203e6f6b73068e81523815e14b5712b9a7e02d (diff)
downloadservo-494a89c27f302c47dff3c95c1a152219ad0463f7.tar.gz
servo-494a89c27f302c47dff3c95c1a152219ad0463f7.zip
Auto merge of #13691 - servo:mem-replace, r=emilio
Use mem::replace in take_pseudo_styles. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13691) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r--components/script/layout_wrapper.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs
index 451cfe82623..bb0aebe73d2 100644
--- a/components/script/layout_wrapper.rs
+++ b/components/script/layout_wrapper.rs
@@ -52,7 +52,7 @@ use selectors::matching::ElementFlags;
use selectors::parser::{AttrSelector, NamespaceConstraint};
use std::fmt;
use std::marker::PhantomData;
-use std::mem::transmute;
+use std::mem::{replace, transmute};
use std::sync::Arc;
use std::sync::atomic::Ordering;
use string_cache::{Atom, Namespace};
@@ -251,10 +251,7 @@ impl<'ln> TNode for ServoLayoutNode<'ln> {
}
fn take_pseudo_styles(&self) -> PseudoStyles {
- use std::mem;
- let mut tmp = PseudoStyles::default();
- mem::swap(&mut tmp, &mut self.mutate_data().unwrap().per_pseudo);
- tmp
+ replace(&mut self.mutate_data().unwrap().per_pseudo, PseudoStyles::default())
}
fn set_pseudo_styles(&self, styles: PseudoStyles) {