diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 21:43:04 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-08 09:28:00 +0100 |
commit | 2012be4a8bd97f2fd69f986c8fffb1af1eec21dc (patch) | |
tree | c9f1ef91146253f72987cb1436866523880965e0 /components/layout/traversal.rs | |
parent | b1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff) | |
download | servo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.tar.gz servo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.zip |
`cargo fix --edition-idioms`
Diffstat (limited to 'components/layout/traversal.rs')
-rw-r--r-- | components/layout/traversal.rs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 51888069cac..6e2e739d8db 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -90,23 +90,23 @@ where /// A top-down traversal. pub trait PreorderFlowTraversal { /// The operation to perform. Return true to continue or false to stop. - fn process(&self, flow: &mut Flow); + fn process(&self, flow: &mut dyn Flow); /// Returns true if this node should be processed and false if neither this node nor its /// descendants should be processed. - fn should_process_subtree(&self, _flow: &mut Flow) -> bool { + fn should_process_subtree(&self, _flow: &mut dyn Flow) -> bool { true } /// Returns true if this node must be processed in-order. If this returns false, /// we skip the operation for this node, but continue processing the descendants. /// This is called *after* parent nodes are visited. - fn should_process(&self, _flow: &mut Flow) -> bool { + fn should_process(&self, _flow: &mut dyn Flow) -> bool { true } /// Traverses the tree in preorder. - fn traverse(&self, flow: &mut Flow) { + fn traverse(&self, flow: &mut dyn Flow) { if !self.should_process_subtree(flow) { return; } @@ -124,7 +124,7 @@ pub trait PreorderFlowTraversal { /// their direct absolute descendants. /// /// Return true if the traversal is to continue or false to stop. - fn traverse_absolute_flows(&self, flow: &mut Flow) { + fn traverse_absolute_flows(&self, flow: &mut dyn Flow) { if self.should_process(flow) { self.process(flow); } @@ -137,17 +137,17 @@ pub trait PreorderFlowTraversal { /// A bottom-up traversal, with a optional in-order pass. pub trait PostorderFlowTraversal { /// The operation to perform. Return true to continue or false to stop. - fn process(&self, flow: &mut Flow); + fn process(&self, flow: &mut dyn Flow); /// Returns false if this node must be processed in-order. If this returns false, we skip the /// operation for this node, but continue processing the ancestors. This is called *after* /// child nodes are visited. - fn should_process(&self, _flow: &mut Flow) -> bool { + fn should_process(&self, _flow: &mut dyn Flow) -> bool { true } /// Traverses the tree in postorder. - fn traverse(&self, flow: &mut Flow) { + fn traverse(&self, flow: &mut dyn Flow) { for kid in flow.mut_base().child_iter_mut() { self.traverse(kid); } @@ -160,16 +160,16 @@ pub trait PostorderFlowTraversal { /// An in-order (sequential only) traversal. pub trait InorderFlowTraversal { /// The operation to perform. Returns the level of the tree we're at. - fn process(&mut self, flow: &mut Flow, level: u32); + fn process(&mut self, flow: &mut dyn Flow, level: u32); /// Returns true if this node should be processed and false if neither this node nor its /// descendants should be processed. - fn should_process_subtree(&mut self, _flow: &mut Flow) -> bool { + fn should_process_subtree(&mut self, _flow: &mut dyn Flow) -> bool { true } /// Traverses the tree in-order. - fn traverse(&mut self, flow: &mut Flow, level: u32) { + fn traverse(&mut self, flow: &mut dyn Flow, level: u32) { if !self.should_process_subtree(flow) { return; } @@ -238,7 +238,7 @@ pub struct BubbleISizes<'a> { impl<'a> PostorderFlowTraversal for BubbleISizes<'a> { #[inline] - fn process(&self, flow: &mut Flow) { + fn process(&self, flow: &mut dyn Flow) { flow.bubble_inline_sizes(); flow.mut_base() .restyle_damage @@ -246,7 +246,7 @@ impl<'a> PostorderFlowTraversal for BubbleISizes<'a> { } #[inline] - fn should_process(&self, flow: &mut Flow) -> bool { + fn should_process(&self, flow: &mut dyn Flow) -> bool { flow.base() .restyle_damage .contains(ServoRestyleDamage::BUBBLE_ISIZES) @@ -261,12 +261,12 @@ pub struct AssignISizes<'a> { impl<'a> PreorderFlowTraversal for AssignISizes<'a> { #[inline] - fn process(&self, flow: &mut Flow) { + fn process(&self, flow: &mut dyn Flow) { flow.assign_inline_sizes(self.layout_context); } #[inline] - fn should_process(&self, flow: &mut Flow) -> bool { + fn should_process(&self, flow: &mut dyn Flow) -> bool { flow.base() .restyle_damage .intersects(ServoRestyleDamage::REFLOW_OUT_OF_FLOW | ServoRestyleDamage::REFLOW) @@ -283,7 +283,7 @@ pub struct AssignBSizes<'a> { impl<'a> PostorderFlowTraversal for AssignBSizes<'a> { #[inline] - fn process(&self, flow: &mut Flow) { + fn process(&self, flow: &mut dyn Flow) { // Can't do anything with anything that floats might flow through until we reach their // inorder parent. // @@ -297,7 +297,7 @@ impl<'a> PostorderFlowTraversal for AssignBSizes<'a> { } #[inline] - fn should_process(&self, flow: &mut Flow) -> bool { + fn should_process(&self, flow: &mut dyn Flow) -> bool { let base = flow.base(); base.restyle_damage.intersects(ServoRestyleDamage::REFLOW_OUT_OF_FLOW | ServoRestyleDamage::REFLOW) && // The fragmentation countainer is responsible for calling @@ -312,14 +312,14 @@ pub struct ComputeStackingRelativePositions<'a> { impl<'a> PreorderFlowTraversal for ComputeStackingRelativePositions<'a> { #[inline] - fn should_process_subtree(&self, flow: &mut Flow) -> bool { + fn should_process_subtree(&self, flow: &mut dyn Flow) -> bool { flow.base() .restyle_damage .contains(ServoRestyleDamage::REPOSITION) } #[inline] - fn process(&self, flow: &mut Flow) { + fn process(&self, flow: &mut dyn Flow) { flow.compute_stacking_relative_position(self.layout_context); flow.mut_base() .restyle_damage @@ -333,7 +333,7 @@ pub struct BuildDisplayList<'a> { impl<'a> BuildDisplayList<'a> { #[inline] - pub fn traverse(&mut self, flow: &mut Flow) { + pub fn traverse(&mut self, flow: &mut dyn Flow) { let parent_stacking_context_id = self.state.current_stacking_context_id; self.state.current_stacking_context_id = flow.base().stacking_context_id; |