auto merge of #3592 : zwarich/servo/trailing-whitespace, r=Manishearth

The Mach test runner doesn't actually make these failures yet, which is tracked by #3482.
servo · Oct 7, 2014 · 6bbd3f4 · 6bbd3f4
2 parents b691876 + fb810c0
commit 6bbd3f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
@@ -1537,7 +1537,7 @@ impl Fragment {
         match self.specific {
             InlineAbsoluteHypotheticalFragment(ref mut info) => {
                 let block_flow = info.flow_ref.get_mut().as_block();
-                block_flow.base.position.size.inline = 
+                block_flow.base.position.size.inline =
                     block_flow.base.intrinsic_inline_sizes.preferred_inline_size +
                     block_flow.base.intrinsic_inline_sizes.surround_inline_size;
 

diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
@@ -187,7 +187,7 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
         unsafe {
             if self.get().is_text() {
                 let text: JS<Text> = self.get_jsmanaged().transmute_copy();
-                (*text.unsafe_get()).characterdata.data.borrow().clone()    
+                (*text.unsafe_get()).characterdata.data.borrow().clone()
             } else if self.get().is_htmlinputelement() {
                 let input: JS<HTMLInputElement> = self.get_jsmanaged().transmute_copy();
                 input.get_value_for_layout()