diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-08 05:11:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 05:11:11 -0500 |
commit | f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6 (patch) | |
tree | b1a3c3010e6c29c4f9d86930f948116b6bf27a93 /components/layout/query.rs | |
parent | b1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff) | |
parent | 9f977c52878e3638f475ca9a78e9f57d0d22893d (diff) | |
download | servo-f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6.tar.gz servo-f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6.zip |
Auto merge of #22133 - servo:extern-crate, r=SimonSapin
Use 2018-edition idioms in crates that use that edition
The first commit is almost entirely mechanical, created by running `cargo fix --edition-idioms` and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing `&mut Formatter` with `&mut Formatter<'_>`, because I don’t like it. The remaining changes are, in many places:
* Add `dyn` to trait object types, for example `Rc<gl::Gl>` to `Rc<dyn gl::Gl>`. This change also works in the 2015 edition.
* Remove `extern crate` where is it made unneeded by changes to the import/module system.
<!-- 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/22133)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/query.rs')
-rw-r--r-- | components/layout/query.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/layout/query.rs b/components/layout/query.rs index 7a6a85824ed..1255e65bcbd 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -366,7 +366,7 @@ impl FragmentBorderBoxIterator for MarginRetrievingFragmentBorderBoxIterator { pub fn process_content_box_request<N: LayoutNode>( requested_node: N, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> Option<Rect<Au>> { // FIXME(pcwalton): This has not been updated to handle the stacking context relative // stuff. So the position is wrong in most cases. @@ -377,7 +377,7 @@ pub fn process_content_box_request<N: LayoutNode>( pub fn process_content_boxes_request<N: LayoutNode>( requested_node: N, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> Vec<Rect<Au>> { // FIXME(pcwalton): This has not been updated to handle the stacking context relative // stuff. So the position is wrong in most cases. @@ -671,7 +671,7 @@ impl FragmentBorderBoxIterator for ParentOffsetBorderBoxIterator { pub fn process_node_geometry_request<N: LayoutNode>( requested_node: N, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> Rect<i32> { let mut iterator = FragmentLocatingFragmentIterator::new(requested_node.opaque()); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); @@ -689,7 +689,7 @@ pub fn process_node_scroll_id_request<N: LayoutNode>( /// https://drafts.csswg.org/cssom-view/#scrolling-area pub fn process_node_scroll_area_request<N: LayoutNode>( requested_node: N, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> Rect<i32> { let mut iterator = UnioningFragmentScrollAreaIterator::new(requested_node.opaque()); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); @@ -742,7 +742,7 @@ pub fn process_resolved_style_request<'a, N>( node: N, pseudo: &Option<PseudoElement>, property: &PropertyId, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> String where N: LayoutNode, @@ -791,7 +791,7 @@ fn process_resolved_style_request_internal<'a, N>( requested_node: N, pseudo: &Option<PseudoElement>, property: &PropertyId, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> String where N: LayoutNode, @@ -843,7 +843,7 @@ where fn used_value_for_position_property<N: LayoutNode>( layout_el: <N::ConcreteThreadSafeLayoutNode as ThreadSafeLayoutNode>::ConcreteThreadSafeLayoutElement, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, requested_node: N, longhand_id: LonghandId, ) -> String { @@ -934,7 +934,7 @@ where pub fn process_offset_parent_query<N: LayoutNode>( requested_node: N, - layout_root: &mut Flow, + layout_root: &mut dyn Flow, ) -> OffsetParentResponse { let mut iterator = ParentOffsetBorderBoxIterator::new(requested_node.opaque()); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); |