Skip to content

Commit 42d694b

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 47be685 commit 42d694b

File tree

3 files changed

+73
-57
lines changed

3 files changed

+73
-57
lines changed

servo/components/layout/inline.rs

Lines changed: 73 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4450,60 +4450,89 @@ ltr
44504450
)
44514451
}
44524452
;
4453-
let
4453+
struct
4454+
MaybeReverse
4455+
<
4456+
I
4457+
>
4458+
{
4459+
iter
4460+
:
4461+
I
44544462
reverse
4463+
:
4464+
bool
4465+
}
4466+
impl
4467+
<
4468+
I
4469+
:
4470+
DoubleEndedIterator
4471+
>
4472+
Iterator
4473+
for
4474+
MaybeReverse
4475+
<
4476+
I
4477+
>
4478+
{
4479+
type
4480+
Item
44554481
=
4456-
level
4457-
.
4458-
is_ltr
4459-
(
4460-
)
4461-
!
4462-
=
4463-
is_ltr
4482+
I
4483+
:
4484+
:
4485+
Item
44644486
;
4465-
let
4466-
fragment_indices
4467-
=
4468-
if
4469-
reverse
4470-
{
4471-
(
4472-
range
4473-
.
4474-
end
4475-
(
4476-
)
4477-
.
4478-
get
4487+
fn
4488+
next
44794489
(
4490+
&
4491+
mut
4492+
self
44804493
)
44814494
-
4482-
1
4495+
>
4496+
Option
4497+
<
4498+
I
4499+
:
4500+
:
4501+
Item
4502+
>
4503+
{
4504+
if
4505+
self
44834506
.
4507+
reverse
4508+
{
4509+
self
44844510
.
4485-
range
4511+
iter
44864512
.
4487-
begin
4513+
next_back
44884514
(
44894515
)
4516+
}
4517+
else
4518+
{
4519+
self
44904520
.
4491-
get
4492-
(
4493-
)
4494-
-
4495-
1
4496-
)
4521+
iter
44974522
.
4498-
step_by
4523+
next
44994524
(
4500-
-
4501-
1
45024525
)
45034526
}
4504-
else
4527+
}
4528+
}
4529+
let
4530+
fragment_indices
4531+
=
4532+
MaybeReverse
45054533
{
4506-
(
4534+
iter
4535+
:
45074536
range
45084537
.
45094538
begin
@@ -4524,12 +4553,16 @@ end
45244553
get
45254554
(
45264555
)
4527-
)
4556+
reverse
4557+
:
4558+
level
45284559
.
4529-
step_by
4560+
is_ltr
45304561
(
4531-
1
45324562
)
4563+
!
4564+
=
4565+
is_ltr
45334566
}
45344567
;
45354568
for

servo/components/layout/lib.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ feature
4646
raw
4747
)
4848
]
49-
#
50-
!
51-
[
52-
feature
53-
(
54-
step_by
55-
)
56-
]
5749
extern
5850
crate
5951
app_units

servo/components/selectors/parser.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9446,15 +9446,6 @@ use
94469446
std
94479447
:
94489448
:
9449-
borrow
9450-
:
9451-
:
9452-
Cow
9453-
;
9454-
use
9455-
std
9456-
:
9457-
:
94589449
collections
94599450
:
94609451
:

0 commit comments

Comments
 (0)