Skip to content

Commit cdfe5ad

Browse files
committed
servo: Merge #17488 - Replace iterator struct with anonymous return iterator type (from frewsxcv:frewsxcv-return-node-list); r=jdm
``` hi servo. it's been some time. here's a pull request. i hope you like it. ``` Source-Repo: https://github.com/servo/servo Source-Revision: bc5e8f89fff9bf1922638b3eb2f4c75148dcad1e UltraBlame original commit: c7135a797d59d6ba87ec006f902c13140ad05f2e
1 parent f27950d commit cdfe5ad

File tree

1 file changed

+46
-91
lines changed

1 file changed

+46
-91
lines changed

servo/components/script/dom/nodelist.rs

Lines changed: 46 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -853,23 +853,61 @@ list
853853
pub
854854
fn
855855
iter
856+
<
857+
'
858+
a
859+
>
856860
(
857861
&
862+
'
863+
a
858864
self
859865
)
860866
-
861867
>
862-
NodeListIterator
863-
{
864-
NodeListIterator
868+
impl
869+
Iterator
870+
<
871+
Item
872+
=
873+
Root
874+
<
875+
Node
876+
>
877+
>
878+
+
879+
'
880+
a
865881
{
866-
nodes
867-
:
882+
let
883+
len
884+
=
868885
self
869-
offset
870-
:
886+
.
887+
Length
888+
(
889+
)
890+
;
891+
(
871892
0
872-
}
893+
.
894+
.
895+
len
896+
)
897+
.
898+
flat_map
899+
(
900+
move
901+
|
902+
i
903+
|
904+
self
905+
.
906+
Item
907+
(
908+
i
909+
)
910+
)
873911
}
874912
}
875913
#
@@ -2312,86 +2350,3 @@ set
23122350
;
23132351
}
23142352
}
2315-
pub
2316-
struct
2317-
NodeListIterator
2318-
<
2319-
'
2320-
a
2321-
>
2322-
{
2323-
nodes
2324-
:
2325-
&
2326-
'
2327-
a
2328-
NodeList
2329-
offset
2330-
:
2331-
u32
2332-
}
2333-
impl
2334-
<
2335-
'
2336-
a
2337-
>
2338-
Iterator
2339-
for
2340-
NodeListIterator
2341-
<
2342-
'
2343-
a
2344-
>
2345-
{
2346-
type
2347-
Item
2348-
=
2349-
Root
2350-
<
2351-
Node
2352-
>
2353-
;
2354-
fn
2355-
next
2356-
(
2357-
&
2358-
mut
2359-
self
2360-
)
2361-
-
2362-
>
2363-
Option
2364-
<
2365-
Root
2366-
<
2367-
Node
2368-
>
2369-
>
2370-
{
2371-
let
2372-
result
2373-
=
2374-
self
2375-
.
2376-
nodes
2377-
.
2378-
Item
2379-
(
2380-
self
2381-
.
2382-
offset
2383-
)
2384-
;
2385-
self
2386-
.
2387-
offset
2388-
=
2389-
self
2390-
.
2391-
offset
2392-
+
2393-
1
2394-
;
2395-
result
2396-
}
2397-
}

0 commit comments

Comments
 (0)