Skip to content

Commit 45d271c

Browse files
committed
servo: Merge #17605 - Replace remaining usage of deprecated Range::step_by (from servo:maybereverse); r=nox
… which is being removed in rust-lang/rust#43012 Source-Repo: https://github.com/servo/servo Source-Revision: 5baea7b73223283b551cf378bb714491a2383c28 UltraBlame original commit: 2828efca932c62b6412d361437ee058577f551ac
1 parent d704adb commit 45d271c

File tree

3 files changed

+86
-70
lines changed

3 files changed

+86
-70
lines changed

servo/components/layout/inline.rs

Lines changed: 86 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7982,6 +7982,82 @@ ltr
79827982
)
79837983
}
79847984
;
7985+
struct
7986+
MaybeReverse
7987+
<
7988+
I
7989+
>
7990+
{
7991+
iter
7992+
:
7993+
I
7994+
reverse
7995+
:
7996+
bool
7997+
}
7998+
impl
7999+
<
8000+
I
8001+
:
8002+
DoubleEndedIterator
8003+
>
8004+
Iterator
8005+
for
8006+
MaybeReverse
8007+
<
8008+
I
8009+
>
8010+
{
8011+
type
8012+
Item
8013+
=
8014+
I
8015+
:
8016+
:
8017+
Item
8018+
;
8019+
fn
8020+
next
8021+
(
8022+
&
8023+
mut
8024+
self
8025+
)
8026+
-
8027+
>
8028+
Option
8029+
<
8030+
I
8031+
:
8032+
:
8033+
Item
8034+
>
8035+
{
8036+
if
8037+
self
8038+
.
8039+
reverse
8040+
{
8041+
self
8042+
.
8043+
iter
8044+
.
8045+
next_back
8046+
(
8047+
)
8048+
}
8049+
else
8050+
{
8051+
self
8052+
.
8053+
iter
8054+
.
8055+
next
8056+
(
8057+
)
8058+
}
8059+
}
8060+
}
79858061
/
79868062
/
79878063
If
@@ -8005,59 +8081,12 @@ reverse
80058081
order
80068082
.
80078083
let
8008-
reverse
8009-
=
8010-
level
8011-
.
8012-
is_ltr
8013-
(
8014-
)
8015-
!
8016-
=
8017-
is_ltr
8018-
;
8019-
let
80208084
fragment_indices
80218085
=
8022-
if
8023-
reverse
8086+
MaybeReverse
80248087
{
8025-
(
8026-
range
8027-
.
8028-
end
8029-
(
8030-
)
8031-
.
8032-
get
8033-
(
8034-
)
8035-
-
8036-
1
8037-
.
8038-
.
8039-
range
8040-
.
8041-
begin
8042-
(
8043-
)
8044-
.
8045-
get
8046-
(
8047-
)
8048-
-
8049-
1
8050-
)
8051-
.
8052-
step_by
8053-
(
8054-
-
8055-
1
8056-
)
8057-
}
8058-
else
8059-
{
8060-
(
8088+
iter
8089+
:
80618090
range
80628091
.
80638092
begin
@@ -8078,12 +8107,16 @@ end
80788107
get
80798108
(
80808109
)
8081-
)
8110+
reverse
8111+
:
8112+
level
80828113
.
8083-
step_by
8114+
is_ltr
80848115
(
8085-
1
80868116
)
8117+
!
8118+
=
8119+
is_ltr
80878120
}
80888121
;
80898122
for

servo/components/layout/lib.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@ feature
104104
raw
105105
)
106106
]
107-
#
108-
!
109-
[
110-
feature
111-
(
112-
step_by
113-
)
114-
]
115107
extern
116108
crate
117109
app_units

servo/components/selectors/parser.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12035,15 +12035,6 @@ use
1203512035
std
1203612036
:
1203712037
:
12038-
borrow
12039-
:
12040-
:
12041-
Cow
12042-
;
12043-
use
12044-
std
12045-
:
12046-
:
1204712038
collections
1204812039
:
1204912040
:

0 commit comments

Comments
 (0)