Skip to content

Commit ad505ea

Browse files
authored
Merge branch 'main' into relaxed-selector-parsing
2 parents 32ae61f + a2ca649 commit ad505ea

File tree

8 files changed

+37
-10
lines changed

8 files changed

+37
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- name: Install stable toolchain
7878
run: |
7979
rustup set profile minimal
80-
rustup override set 1.70.0
80+
rustup override set 1.71.0
8181
8282
- run: cargo check --lib --all-features
8383

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ members = [
1010
]
1111

1212
[workspace.package]
13-
version = "0.35.0"
13+
version = "0.36.1"
1414
license = "MIT OR Apache-2.0"
1515
authors = [ "The html5ever Project Developers" ]
1616
repository = "https://github.com/servo/html5ever"
1717
edition = "2021"
18-
rust-version = "1.70.0"
18+
rust-version = "1.71.0"
1919

2020
[workspace.dependencies]
2121
# Repo dependencies
2222
tendril = { version = "0.4.3", path = "tendril" }
23-
web_atoms = { version = "0.1", path = "web_atoms" }
24-
markup5ever = { version = "0.35.0", path = "markup5ever" }
25-
xml5ever = { version = "0.35.0", path = "xml5ever" }
26-
html5ever = { version = "0.35.0", path = "html5ever" }
23+
web_atoms = { version = "0.2", path = "web_atoms" }
24+
markup5ever = { version = "0.36.1", path = "markup5ever" }
25+
xml5ever = { version = "0.36.1", path = "xml5ever" }
26+
html5ever = { version = "0.36.1", path = "html5ever" }
2727

2828
# External dependencies
2929
encoding = "0.2"
@@ -32,7 +32,7 @@ log = "0.4"
3232
new_debug_unreachable = "1.0.2"
3333
phf = "0.13"
3434
phf_codegen = "0.13"
35-
string_cache = "0.9.0"
35+
string_cache = { version = "0.9.0", default-features = false }
3636
string_cache_codegen = "0.6.1"
3737
utf-8 = "0.7"
3838

html5ever/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rust-version.workspace = true
1414

1515
[features]
1616
trace_tokenizer = []
17+
serde = ["markup5ever/serde"]
1718

1819
[dependencies]
1920
markup5ever = { workspace = true }

markup5ever/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ rust-version.workspace = true
1313
[lib]
1414
path = "lib.rs"
1515

16+
[features]
17+
serde = ["web_atoms/serde"]
18+
1619
[dependencies]
1720
web_atoms = { workspace = true }
1821
tendril = { workspace = true }

rcdom/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ path = "lib.rs"
1616

1717
[dependencies]
1818
html5ever = { workspace = true }
19-
markup5ever = { workspace = true }
19+
markup5ever = { workspace = true, features = ["serde"]}
2020
xml5ever = { workspace = true }
2121
tendril = { workspace = true }
2222

web_atoms/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "web_atoms"
3-
version = "0.1.3"
3+
version = "0.2.0"
44
authors = [ "The html5ever Project Developers" ]
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/servo/html5ever"
@@ -14,6 +14,9 @@ rust-version.workspace = true
1414
[lib]
1515
path = "lib.rs"
1616

17+
[features]
18+
serde = ["string_cache/serde_support"]
19+
1720
[dependencies]
1821
string_cache = { workspace = true }
1922
phf = { workspace = true }

web_atoms/local_names.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ clip-rule
180180
clipPath
181181
clipPathUnits
182182
close
183+
closedby
183184
closure
184185
cn
185186
code
@@ -200,6 +201,8 @@ columnlines
200201
columnspacing
201202
columnspan
202203
columnwidth
204+
command
205+
commandfor
203206
compact
204207
complexes
205208
compose
@@ -400,6 +403,10 @@ h5
400403
h6
401404
handler
402405
hanging
406+
hatch
407+
hatchContentUnits
408+
hatchUnits
409+
hatchpath
403410
head
404411
header
405412
headers
@@ -523,6 +530,7 @@ markerUnits
523530
markerWidth
524531
marquee
525532
mask
533+
mask-type
526534
maskContentUnits
527535
maskUnits
528536
math
@@ -630,6 +638,7 @@ onbeforecut
630638
onbeforeeditfocus
631639
onbeforepaste
632640
onbeforeprint
641+
onbeforetoggle
633642
onbeforeunload
634643
onbeforeupdate
635644
onbegin
@@ -642,6 +651,7 @@ oncellchange
642651
onchange
643652
onclick
644653
onclose
654+
oncommand
645655
oncontextmenu
646656
oncontrolselect
647657
oncopy
@@ -779,8 +789,10 @@ picture
779789
piece
780790
piecewise
781791
ping
792+
pitch
782793
placeholder
783794
plaintext
795+
playbackorder
784796
plus
785797
pointer-events
786798
points
@@ -789,6 +801,9 @@ pointsAtY
789801
pointsAtZ
790802
polygon
791803
polyline
804+
popover
805+
popovertarget
806+
popovertargetaction
792807
poster
793808
power
794809
pre
@@ -903,6 +918,9 @@ sizes
903918
slope
904919
slot
905920
small
921+
solid-color
922+
solid-opacity
923+
solidColor
906924
solidcolor
907925
source
908926
space
@@ -986,6 +1004,7 @@ thead
9861004
thickmathspace
9871005
thinmathspace
9881006
time
1007+
timelinebegin
9891008
times
9901009
title
9911010
to

xml5ever/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rust-version.workspace = true
1616

1717
[features]
1818
trace_tokenizer = []
19+
serde = ["markup5ever/serde"]
1920

2021
[dependencies]
2122
markup5ever = { workspace = true }

0 commit comments

Comments
 (0)