Skip to content

Commit 7634561

Browse files
author
bors-servo
authored
Auto merge of #260 - nox:update-tests, r=Ms2ger
Update html5lib-tests <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/260) <!-- Reviewable:end -->
2 parents ab2bab0 + 63cb670 commit 7634561

File tree

5 files changed

+4
-19
lines changed

5 files changed

+4
-19
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "html5ever"
4-
version = "0.14.0"
4+
version = "0.14.1"
55
authors = [ "The html5ever Project Developers" ]
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/html5ever"

src/serialize/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl<'wr, Wr: Write> Serializer<'wr, Wr> {
156156
let ignore_children = name.ns == ns!(html) && match name.local {
157157
local_name!("area") | local_name!("base") | local_name!("basefont") | local_name!("bgsound") | local_name!("br")
158158
| local_name!("col") | local_name!("embed") | local_name!("frame") | local_name!("hr") | local_name!("img")
159-
| local_name!("input") | local_name!("keygen") | local_name!("link") | local_name!("menuitem")
159+
| local_name!("input") | local_name!("keygen") | local_name!("link")
160160
| local_name!("meta") | local_name!("param") | local_name!("source") | local_name!("track") | local_name!("wbr")
161161
=> true,
162162
_ => false,

src/tree_builder/rules.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@ impl<Handle, Sink> TreeBuilderStep<Handle>
358358

359359
tag @ <menu> => {
360360
self.close_p_element_in_button_scope();
361-
if self.current_node_named(local_name!("menuitem")) {
362-
self.pop();
363-
}
364361
self.insert_element_for(tag);
365362
Done
366363
}
@@ -623,9 +620,6 @@ impl<Handle, Sink> TreeBuilderStep<Handle>
623620

624621
tag @ <hr> => {
625622
self.close_p_element_in_button_scope();
626-
if self.current_node_named(local_name!("menuitem")) {
627-
self.pop();
628-
}
629623
self.insert_and_pop_element_for(tag);
630624
self.frameset_ok = false;
631625
DoneAckSelfClosing
@@ -686,15 +680,6 @@ impl<Handle, Sink> TreeBuilderStep<Handle>
686680
Done
687681
}
688682

689-
tag @ <menuitem> => {
690-
if self.current_node_named(local_name!("menuitem")) {
691-
self.pop();
692-
}
693-
self.reconstruct_formatting();
694-
self.insert_element_for(tag);
695-
Done
696-
}
697-
698683
tag @ <rb> <rtc> => {
699684
if self.in_scope_named(default_scope, local_name!("ruby")) {
700685
self.generate_implied_end(cursory_implied_end);

src/tree_builder/tag_sets.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ declare_tag_set!(pub table_row_context = "tr" "template" "html");
6565
declare_tag_set!(pub td_th = "td" "th");
6666

6767
declare_tag_set!(pub cursory_implied_end =
68-
"dd" "dt" "li" "menuitem" "option" "optgroup" "p" "rb" "rp" "rt" "rtc");
68+
"dd" "dt" "li" "option" "optgroup" "p" "rb" "rp" "rt" "rtc");
6969

7070
declare_tag_set!(pub thorough_implied_end = [cursory_implied_end]
7171
+ "caption" "colgroup" "tbody" "td" "tfoot" "th" "thead" "tr");

0 commit comments

Comments
 (0)