From da46b79501f47f25f13f48102dcf92bf70bcd932 Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Thu, 7 Dec 2017 12:34:17 +0100 Subject: [PATCH 1/3] Remove the heap_size feature --- html5ever/Cargo.toml | 3 --- markup5ever/Cargo.toml | 5 ----- markup5ever/interface/mod.rs | 1 - markup5ever/interface/tree_builder.rs | 1 - markup5ever/lib.rs | 2 -- 5 files changed, 12 deletions(-) diff --git a/html5ever/Cargo.toml b/html5ever/Cargo.toml index 28dae12c..962b6414 100644 --- a/html5ever/Cargo.toml +++ b/html5ever/Cargo.toml @@ -30,9 +30,6 @@ name = "serializer" name = "tokenizer" harness = false -[features] -heap_size = ["markup5ever/heap_size"] - [dependencies] log = "0.3" mac = "0.1" diff --git a/markup5ever/Cargo.toml b/markup5ever/Cargo.toml index 5731b57e..6138b67e 100644 --- a/markup5ever/Cargo.toml +++ b/markup5ever/Cargo.toml @@ -12,15 +12,10 @@ categories = [ "parser-implementations", "web-programming" ] [lib] path = "lib.rs" -[features] -heap_size = ["heapsize", "heapsize_derive", "string_cache/heapsize"] - [dependencies] string_cache = "0.6" phf = "0.7" tendril = "0.4" -heapsize = { version = ">= 0.3, < 0.5", optional = true } -heapsize_derive = { version = "0.1", optional = true } [build-dependencies] string_cache_codegen = "0.4" diff --git a/markup5ever/interface/mod.rs b/markup5ever/interface/mod.rs index a7e57bd2..859feac6 100644 --- a/markup5ever/interface/mod.rs +++ b/markup5ever/interface/mod.rs @@ -58,7 +58,6 @@ pub mod tree_builder; /// A name with a namespace. #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone)] -#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))] /// Fully qualified name. Used to depict names of tags and attributes. /// /// Used to differentiate between similar XML fragments. For example: diff --git a/markup5ever/interface/tree_builder.rs b/markup5ever/interface/tree_builder.rs index 641484a6..206eaca7 100644 --- a/markup5ever/interface/tree_builder.rs +++ b/markup5ever/interface/tree_builder.rs @@ -31,7 +31,6 @@ pub enum NodeOrText { /// A document's quirks mode. #[derive(PartialEq, Eq, Copy, Clone, Hash, Debug)] -#[cfg_attr(feature = "heap_size", derive(HeapSizeOf))] pub enum QuirksMode { Quirks, LimitedQuirks, diff --git a/markup5ever/lib.rs b/markup5ever/lib.rs index 5dc54b30..82597400 100644 --- a/markup5ever/lib.rs +++ b/markup5ever/lib.rs @@ -7,8 +7,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[cfg(feature = "heap_size")] #[macro_use] extern crate heapsize_derive; -#[cfg(feature = "heap_size")] extern crate heapsize; extern crate string_cache; extern crate phf; pub extern crate tendril; From 4cdfd2f1314cf188b634344ccaa79ec56df32f33 Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Thu, 7 Dec 2017 12:38:51 +0100 Subject: [PATCH 2/3] Bump string_cache to 0.7 --- markup5ever/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markup5ever/Cargo.toml b/markup5ever/Cargo.toml index 6138b67e..84b0c1e7 100644 --- a/markup5ever/Cargo.toml +++ b/markup5ever/Cargo.toml @@ -13,7 +13,7 @@ categories = [ "parser-implementations", "web-programming" ] path = "lib.rs" [dependencies] -string_cache = "0.6" +string_cache = "0.7" phf = "0.7" tendril = "0.4" From 71068d0554948c46678904227d4edf521d2d5b08 Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Thu, 7 Dec 2017 12:41:45 +0100 Subject: [PATCH 3/3] Bump versions --- html5ever/Cargo.toml | 4 ++-- markup5ever/Cargo.toml | 2 +- xml5ever/Cargo.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/html5ever/Cargo.toml b/html5ever/Cargo.toml index 962b6414..91f15a48 100644 --- a/html5ever/Cargo.toml +++ b/html5ever/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "html5ever" -version = "0.21.0" +version = "0.22.0" authors = [ "The html5ever Project Developers" ] license = "MIT / Apache-2.0" repository = "https://github.com/servo/html5ever" @@ -33,7 +33,7 @@ harness = false [dependencies] log = "0.3" mac = "0.1" -markup5ever = { version = "0.6", path = "../markup5ever" } +markup5ever = { version = "0.7", path = "../markup5ever" } [dev-dependencies] rustc-serialize = "0.3.15" diff --git a/markup5ever/Cargo.toml b/markup5ever/Cargo.toml index 84b0c1e7..dd85a110 100644 --- a/markup5ever/Cargo.toml +++ b/markup5ever/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "markup5ever" -version = "0.6.2" +version = "0.7.0" authors = [ "The html5ever Project Developers" ] license = "MIT / Apache-2.0" repository = "https://github.com/servo/html5ever" diff --git a/xml5ever/Cargo.toml b/xml5ever/Cargo.toml index 4be011e3..4c598c91 100644 --- a/xml5ever/Cargo.toml +++ b/xml5ever/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "xml5ever" -version = "0.11.1" +version = "0.11.2" authors = ["The xml5ever project developers"] license = "MIT / Apache-2.0" repository = "https://github.com/servo/html5ever" @@ -23,7 +23,7 @@ doctest = true time = "0.1" log = "0.3" mac = "0.1" -markup5ever = {version = "0.6", path = "../markup5ever" } +markup5ever = {version = "0.7", path = "../markup5ever" } [dev-dependencies] rustc-serialize = "0.3.15"