aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/multicol.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-08 05:11:11 -0500
committerGitHub <noreply@github.com>2018-11-08 05:11:11 -0500
commitf220a63a0f4d7757c2a5e7c9da1c2063d37bebd6 (patch)
treeb1a3c3010e6c29c4f9d86930f948116b6bf27a93 /components/layout/multicol.rs
parentb1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff)
parent9f977c52878e3638f475ca9a78e9f57d0d22893d (diff)
downloadservo-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/multicol.rs')
-rw-r--r--components/layout/multicol.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs
index 71d9befac61..0d2a72a7b3b 100644
--- a/components/layout/multicol.rs
+++ b/components/layout/multicol.rs
@@ -241,7 +241,7 @@ impl Flow for MulticolFlow {
fn iterate_through_fragment_border_boxes(
&self,
- iterator: &mut FragmentBorderBoxIterator,
+ iterator: &mut dyn FragmentBorderBoxIterator,
level: i32,
stacking_context_position: &Point2D<Au>,
) {
@@ -252,7 +252,7 @@ impl Flow for MulticolFlow {
);
}
- fn mutate_fragments(&mut self, mutator: &mut FnMut(&mut Fragment)) {
+ fn mutate_fragments(&mut self, mutator: &mut dyn FnMut(&mut Fragment)) {
self.block_flow.mutate_fragments(mutator);
}
@@ -295,7 +295,7 @@ impl Flow for MulticolColumnFlow {
&mut self,
layout_context: &LayoutContext,
fragmentation_context: Option<FragmentationContext>,
- ) -> Option<Arc<Flow>> {
+ ) -> Option<Arc<dyn Flow>> {
Flow::fragment(&mut self.block_flow, layout_context, fragmentation_context)
}
@@ -345,7 +345,7 @@ impl Flow for MulticolColumnFlow {
fn iterate_through_fragment_border_boxes(
&self,
- iterator: &mut FragmentBorderBoxIterator,
+ iterator: &mut dyn FragmentBorderBoxIterator,
level: i32,
stacking_context_position: &Point2D<Au>,
) {
@@ -356,7 +356,7 @@ impl Flow for MulticolColumnFlow {
);
}
- fn mutate_fragments(&mut self, mutator: &mut FnMut(&mut Fragment)) {
+ fn mutate_fragments(&mut self, mutator: &mut dyn FnMut(&mut Fragment)) {
self.block_flow.mutate_fragments(mutator);
}