From 80bcbcb9663d53c3d2e589c06c034bc5794a987c Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 5 Mar 2016 17:10:12 +0100
Subject: [PATCH 1/4] Use the unstable feature of string_cache and selectors in
 geckolib

This should enable Cargo to reuse more build artifacts between servo and geckolib.
---
 ports/geckolib/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index a9a853b4d41..bd2b0406f9b 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -19,9 +19,9 @@ lazy_static = "0.1"
 libc = "0.2"
 log = "0.3"
 num_cpus = "0.2.2"
-selectors = {version = "0.5", features = ["heap_size"]}
+selectors = {version = "0.5", features = ["heap_size", "unstable"]}
 smallvec = "0.1"
-string_cache = {version = "0.2.10", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size", "unstable"]}
 url = {version = "0.5.5", features = ["heap_size"]}
 
 [dependencies.plugins]

From 5f2a69b3b7d0ba18d1a431200053ec0cc10e56ca Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 5 Mar 2016 18:52:43 +0100
Subject: [PATCH 2/4] Use release_max_level_info in all ports

---
 ports/cef/Cargo.toml      | 5 ++++-
 ports/geckolib/Cargo.toml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index 25761eb7c77..1fcb383a190 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -12,7 +12,6 @@ crate-type = ["dylib"]
 euclid = {version = "0.6.2", features = ["plugins"]}
 gleam = "0.2"
 libc = "0.2"
-log = "0.3"
 url = {version = "0.5.5", features = ["heap_size"]}
 
 [dependencies.servo]
@@ -30,6 +29,10 @@ path = "../../components/compositing"
 [dependencies.gfx]
 path = "../../components/gfx"
 
+[dependencies.log]
+version = "0.3"
+features = ["release_max_level_info"]
+
 [dependencies.script]
 path = "../../components/script"
 
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index bd2b0406f9b..8ced4a19365 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -17,13 +17,16 @@ heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 lazy_static = "0.1"
 libc = "0.2"
-log = "0.3"
 num_cpus = "0.2.2"
 selectors = {version = "0.5", features = ["heap_size", "unstable"]}
 smallvec = "0.1"
 string_cache = {version = "0.2.10", features = ["heap_size", "unstable"]}
 url = {version = "0.5.5", features = ["heap_size"]}
 
+[dependencies.log]
+version = "0.3"
+features = ["release_max_level_info"]
+
 [dependencies.plugins]
 path = "../../components/plugins"
 

From b7ef9ed97a0210fb19dd2c7270e6619d3d07d0d7 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 5 Mar 2016 20:37:26 +0100
Subject: [PATCH 3/4] Enable nightly feature for serde in style

Some external dependencies (at least webrender_traits) present only in servo
and not in geckolib use it already and this prevents Cargo to reuse build
artifacts depending on serde between the two targets.
---
 components/style/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index be060d0ca20..a0b1a83f9ce 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -34,7 +34,7 @@ matches = "0.1"
 num = "0.1.24"
 rustc-serialize = "0.3"
 selectors = {version = "0.5", features = ["heap_size", "unstable"]}
-serde = "0.6"
+serde = {version = "0.6", features = ["nightly"]}
 serde_macros = "0.6"
 smallvec = "0.1"
 string_cache = {version = "0.2.10", features = ["heap_size"]}

From d59cad2dd9aace8a7a7f67facd5076e4d83117e7 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 5 Mar 2016 20:50:28 +0100
Subject: [PATCH 4/4] Enable query_encoding in geckolib

This allows the reuse of teh build artifacts of url and all the things that
depends on it between servo and geckolib.
---
 ports/geckolib/Cargo.lock | 1 +
 ports/geckolib/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock
index c880ba7ff18..09ff2751de8 100644
--- a/ports/geckolib/Cargo.lock
+++ b/ports/geckolib/Cargo.lock
@@ -509,6 +509,7 @@ name = "url"
 version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 8ced4a19365..f869ab4fa8c 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -21,7 +21,7 @@ num_cpus = "0.2.2"
 selectors = {version = "0.5", features = ["heap_size", "unstable"]}
 smallvec = "0.1"
 string_cache = {version = "0.2.10", features = ["heap_size", "unstable"]}
-url = {version = "0.5.5", features = ["heap_size"]}
+url = {version = "0.5.5", features = ["heap_size", "query_encoding", "serde_serialization"]}
 
 [dependencies.log]
 version = "0.3"