From d8203e6f6b73068e81523815e14b5712b9a7e02d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 11 Oct 2016 11:13:53 +0200 Subject: [PATCH] Use mem::replace in take_pseudo_styles. --- components/script/layout_wrapper.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index f2947bedc93..292c3b044e4 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) {