Skip to content

Commit

Permalink
servo: Merge #7429 - Fixed serialize_list to no longer append an addi…
Browse files Browse the repository at this point in the history
…tional space at the e… (from GyrosOfWar:serialize_list_space_fix); r=jdm

…nd of the string.

Fixes #7404

Source-Repo: https://github.com/servo/servo
Source-Revision: e1ede2074d2ceb74c0d9f38b23697f17dc3a8fc9

UltraBlame original commit: 75b95728f586e13d18d00e4dd5840e8f9263112d
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 536ef0c commit 68c5b67
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 17 deletions.
47 changes: 30 additions & 17 deletions servo/components/script/dom/cssstyledeclaration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,15 @@ cell
:
Ref
;
use
std
:
:
slice
:
:
SliceConcatExt
;
#
[
dom_struct
Expand Down Expand Up @@ -337,38 +346,42 @@ PropertyDeclaration
>
DOMString
{
let
strings
:
Vec
<
_
>
=
list
.
iter
(
)
.
fold
(
String
:
:
new
map
(
)
|
accum
ref
declaration
d
|
{
accum
+
&
declaration
d
.
value
(
)
+
)
.
collect
(
)
;
strings
.
join
(
"
"
}
)
}
impl
Expand Down
8 changes: 8 additions & 0 deletions servo/components/script/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,14 @@ vec_push_all
#
!
[
feature
(
slice_concat_ext
)
]
#
!
[
deny
(
unsafe_code
Expand Down

0 comments on commit 68c5b67

Please sign in to comment.