aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/flow_list.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/flow_list.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/flow_list.rs')
-rw-r--r--components/layout/flow_list.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/components/layout/flow_list.rs b/components/layout/flow_list.rs
index c24734a5a7d..07b42f19a9d 100644
--- a/components/layout/flow_list.rs
+++ b/components/layout/flow_list.rs
@@ -69,11 +69,11 @@ impl FlowList {
self.flows.push_back(new_tail);
}
- pub fn push_back_arc(&mut self, new_head: Arc<Flow>) {
+ pub fn push_back_arc(&mut self, new_head: Arc<dyn Flow>) {
self.flows.push_back(FlowRef::new(new_head));
}
- pub fn back(&self) -> Option<&Flow> {
+ pub fn back(&self) -> Option<&dyn Flow> {
self.flows.back().map(|x| &**x)
}
@@ -84,15 +84,15 @@ impl FlowList {
self.flows.push_front(new_head);
}
- pub fn push_front_arc(&mut self, new_head: Arc<Flow>) {
+ pub fn push_front_arc(&mut self, new_head: Arc<dyn Flow>) {
self.flows.push_front(FlowRef::new(new_head));
}
- pub fn pop_front_arc(&mut self) -> Option<Arc<Flow>> {
+ pub fn pop_front_arc(&mut self) -> Option<Arc<dyn Flow>> {
self.flows.pop_front().map(FlowRef::into_arc)
}
- pub fn front(&self) -> Option<&Flow> {
+ pub fn front(&self) -> Option<&dyn Flow> {
self.flows.front().map(|x| &**x)
}
@@ -161,21 +161,21 @@ impl FlowList {
}
impl<'a> DoubleEndedIterator for FlowListIterator<'a> {
- fn next_back(&mut self) -> Option<&'a Flow> {
+ fn next_back(&mut self) -> Option<&'a dyn Flow> {
self.it.next_back().map(Deref::deref)
}
}
impl<'a> DoubleEndedIterator for MutFlowListIterator<'a> {
- fn next_back(&mut self) -> Option<&'a mut Flow> {
+ fn next_back(&mut self) -> Option<&'a mut dyn Flow> {
self.it.next_back().map(FlowRef::deref_mut)
}
}
impl<'a> Iterator for FlowListIterator<'a> {
- type Item = &'a Flow;
+ type Item = &'a dyn Flow;
#[inline]
- fn next(&mut self) -> Option<&'a Flow> {
+ fn next(&mut self) -> Option<&'a dyn Flow> {
self.it.next().map(Deref::deref)
}
@@ -186,9 +186,9 @@ impl<'a> Iterator for FlowListIterator<'a> {
}
impl<'a> Iterator for MutFlowListIterator<'a> {
- type Item = &'a mut Flow;
+ type Item = &'a mut dyn Flow;
#[inline]
- fn next(&mut self) -> Option<&'a mut Flow> {
+ fn next(&mut self) -> Option<&'a mut dyn Flow> {
self.it.next().map(FlowRef::deref_mut)
}
@@ -206,7 +206,7 @@ pub struct FlowListRandomAccessMut<'a> {
}
impl<'a> FlowListRandomAccessMut<'a> {
- pub fn get<'b>(&'b mut self, index: usize) -> &'b mut Flow {
+ pub fn get<'b>(&'b mut self, index: usize) -> &'b mut dyn Flow {
while index >= self.cache.len() {
match self.iterator.next() {
None => panic!("Flow index out of range!"),