diff options
author | Jack Moffitt <jack@metajack.im> | 2014-11-05 12:33:11 -0700 |
---|---|---|
committer | Glenn Watson <gw@intuitionlibrary.com> | 2014-11-13 11:17:43 +1000 |
commit | d1b433a3b3bab353f320b2f39fa953ce326d2d55 (patch) | |
tree | d7a197abb65827b36c47e6b5c3adcce9071643d3 /components/layout/parallel.rs | |
parent | 26045d7fcbab8851fbefe2851cd904203f8fd8dd (diff) | |
download | servo-d1b433a3b3bab353f320b2f39fa953ce326d2d55.tar.gz servo-d1b433a3b3bab353f320b2f39fa953ce326d2d55.zip |
Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a
Diffstat (limited to 'components/layout/parallel.rs')
-rw-r--r-- | components/layout/parallel.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 42008396cab..d0dbf469c2b 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -25,7 +25,7 @@ use servo_util::time; use servo_util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; use std::mem; use std::ptr; -use std::sync::atomics::{AtomicInt, Relaxed, SeqCst}; +use std::sync::atomic::{AtomicInt, Relaxed, SeqCst}; #[allow(dead_code)] fn static_assertion(node: UnsafeLayoutNode) { @@ -431,7 +431,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef, if opts::get().bubble_inline_sizes_separately { let layout_context = LayoutContext::new(shared_layout_context); let bubble_inline_sizes = BubbleISizes { layout_context: &layout_context }; - root.traverse_postorder(&bubble_inline_sizes); + root.deref_mut().traverse_postorder(&bubble_inline_sizes); } queue.data = shared_layout_context as *const _; |