From dc1db5187e52536a7d419f6d4d7c110a352ae7f8 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 16 Jun 2015 00:18:20 +0200 Subject: [PATCH] Use html5ever from crates.io --- components/script/Cargo.toml | 4 +-- components/servo/Cargo.lock | 53 +++++++++++++++++++++++---------- ports/cef/Cargo.lock | 57 +++++++++++++++++++++++++----------- ports/gonk/Cargo.lock | 57 +++++++++++++++++++++++++----------- 4 files changed, 119 insertions(+), 52 deletions(-) diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index a7bc559ba7a..39a7a8460ce 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -51,9 +51,6 @@ git = "https://github.com/servo/rust-selectors" [dependencies.geom] git = "https://github.com/servo/rust-geom" -[dependencies.html5ever] -git = "https://github.com/servo/html5ever" - [dependencies.js] git = "https://github.com/servo/rust-mozjs" @@ -88,3 +85,4 @@ num = "0.1.24" websocket = "0.12" uuid = "0.1.16" smallvec = "0.1" +html5ever = "0.1" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e4d75ff0d6f..159a22fe56e 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -539,25 +539,25 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "html5ever_macros" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -717,11 +717,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mac" -version = "0.0.2" -source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" - [[package]] name = "mac" version = "0.0.2" @@ -1042,7 +1037,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", - "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1149,6 +1144,19 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_plugin" version = "0.1.1" @@ -1159,11 +1167,26 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_plugin" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_shared" version = "0.1.0" source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf" +[[package]] +name = "string_cache_shared" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "style" version = "0.0.1" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ea9e54f406b..ae1c6295d7a 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -79,7 +79,7 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx_traits 0.0.1", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", + "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -156,7 +156,7 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "gfx_traits 0.0.1", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", + "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -551,25 +551,25 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "html5ever_macros" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -729,11 +729,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mac" -version = "0.0.2" -source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" - [[package]] name = "mac" version = "0.0.2" @@ -1042,7 +1037,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", - "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1167,6 +1162,19 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_plugin" version = "0.1.1" @@ -1177,11 +1185,26 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_plugin" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_shared" version = "0.1.0" source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf" +[[package]] +name = "string_cache_shared" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "style" version = "0.0.1" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6f37eee61b1..0e5611e8944 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -66,7 +66,7 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx_traits 0.0.1", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", + "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -124,7 +124,7 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "gfx_traits 0.0.1", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", + "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -476,25 +476,25 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "html5ever_macros" -version = "0.0.0" -source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -654,11 +654,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mac" -version = "0.0.2" -source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" - [[package]] name = "mac" version = "0.0.2" @@ -941,7 +936,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", - "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", + "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1056,6 +1051,19 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_plugin" version = "0.1.1" @@ -1066,11 +1074,26 @@ dependencies = [ "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_plugin" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "string_cache_shared" version = "0.1.0" source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf" +[[package]] +name = "string_cache_shared" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "style" version = "0.0.1"