From 86293c3b398ed3ece5627b02942f8d2eee997e02 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 5 Jul 2017 13:54:40 +0200
Subject: [PATCH 1/2] Replace remaining usage of deprecated Range::step_by
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… which is being removed in https://github.com/rust-lang/rust/pull/43012
---
 components/layout/inline.rs | 26 +++++++++++++++++++++-----
 components/layout/lib.rs    |  1 -
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 1ce18b562bbb..60edeedff4b1 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -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 {
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 0b9615509747..af108249c42a 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -8,7 +8,6 @@
 #![feature(conservative_impl_trait)]
 #![feature(nonzero)]
 #![feature(raw)]
-#![feature(step_by)]
 
 extern crate app_units;
 extern crate atomic_refcell;

From 7e0254b5307af01e2b5a7d473a214e14a767ffc8 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 5 Jul 2017 13:58:06 +0200
Subject: [PATCH 2/2] Drive-by fix "unused import" warning.

---
 components/selectors/parser.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index c73ac10f4420..f341911a33cb 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -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::*;