Skip to content

Commit

Permalink
Auto merge of #17605 - servo:maybereverse, r=nox
Browse files Browse the repository at this point in the history
Replace remaining usage of deprecated Range::step_by

… which is being removed in rust-lang/rust#43012

<!-- 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/17605)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jul 5, 2017
2 parents 42e551f + 7e0254b commit 5baea7b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
26 changes: 21 additions & 5 deletions components/layout/inline.rs
Expand Up @@ -962,13 +962,29 @@ impl InlineFlow {
Some(ref runs) => runs[run_count - run_idx - 1], // reverse order for RTL runs
None => (line.range, bidi::Level::ltr())
};

struct MaybeReverse<I> {
iter: I,
reverse: bool,
}

impl<I: DoubleEndedIterator> Iterator for MaybeReverse<I> {
type Item = I::Item;

fn next(&mut self) -> Option<I::Item> {
if self.reverse {
self.iter.next_back()
} else {
self.iter.next()
}
}
}

// If the bidi embedding direction is opposite the layout direction, lay out this
// run in reverse order.
let reverse = level.is_ltr() != is_ltr;
let fragment_indices = if reverse {
(range.end().get() - 1..range.begin().get() - 1).step_by(-1)
} else {
(range.begin().get()..range.end().get()).step_by(1)
let fragment_indices = MaybeReverse {
iter: range.begin().get()..range.end().get(),
reverse: level.is_ltr() != is_ltr,
};

for fragment_index in fragment_indices {
Expand Down
1 change: 0 additions & 1 deletion components/layout/lib.rs
Expand Up @@ -8,7 +8,6 @@
#![feature(conservative_impl_trait)]
#![feature(nonzero)]
#![feature(raw)]
#![feature(step_by)]

extern crate app_units;
extern crate atomic_refcell;
Expand Down
1 change: 0 additions & 1 deletion components/selectors/parser.rs
Expand Up @@ -1572,7 +1572,6 @@ pub mod tests {
use builder::HAS_PSEUDO_BIT;
use cssparser::{Parser as CssParser, ToCss, serialize_identifier, ParserInput};
use parser;
use std::borrow::Cow;
use std::collections::HashMap;
use std::fmt;
use super::*;
Expand Down

0 comments on commit 5baea7b

Please sign in to comment.