Skip to content

Commit 28256a5

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 f506a2b commit 28256a5

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
@@ -777,23 +777,61 @@ list
777777
pub
778778
fn
779779
iter
780+
<
781+
'
782+
a
783+
>
780784
(
781785
&
786+
'
787+
a
782788
self
783789
)
784790
-
785791
>
786-
NodeListIterator
787-
{
788-
NodeListIterator
792+
impl
793+
Iterator
794+
<
795+
Item
796+
=
797+
Root
798+
<
799+
Node
800+
>
801+
>
802+
+
803+
'
804+
a
789805
{
790-
nodes
791-
:
806+
let
807+
len
808+
=
792809
self
793-
offset
794-
:
810+
.
811+
Length
812+
(
813+
)
814+
;
815+
(
795816
0
796-
}
817+
.
818+
.
819+
len
820+
)
821+
.
822+
flat_map
823+
(
824+
move
825+
|
826+
i
827+
|
828+
self
829+
.
830+
Item
831+
(
832+
i
833+
)
834+
)
797835
}
798836
}
799837
#
@@ -1908,86 +1946,3 @@ set
19081946
;
19091947
}
19101948
}
1911-
pub
1912-
struct
1913-
NodeListIterator
1914-
<
1915-
'
1916-
a
1917-
>
1918-
{
1919-
nodes
1920-
:
1921-
&
1922-
'
1923-
a
1924-
NodeList
1925-
offset
1926-
:
1927-
u32
1928-
}
1929-
impl
1930-
<
1931-
'
1932-
a
1933-
>
1934-
Iterator
1935-
for
1936-
NodeListIterator
1937-
<
1938-
'
1939-
a
1940-
>
1941-
{
1942-
type
1943-
Item
1944-
=
1945-
Root
1946-
<
1947-
Node
1948-
>
1949-
;
1950-
fn
1951-
next
1952-
(
1953-
&
1954-
mut
1955-
self
1956-
)
1957-
-
1958-
>
1959-
Option
1960-
<
1961-
Root
1962-
<
1963-
Node
1964-
>
1965-
>
1966-
{
1967-
let
1968-
result
1969-
=
1970-
self
1971-
.
1972-
nodes
1973-
.
1974-
Item
1975-
(
1976-
self
1977-
.
1978-
offset
1979-
)
1980-
;
1981-
self
1982-
.
1983-
offset
1984-
=
1985-
self
1986-
.
1987-
offset
1988-
+
1989-
1
1990-
;
1991-
result
1992-
}
1993-
}

0 commit comments

Comments
 (0)