From b98acc2f752aaa783f68483a81b79984a2dc7b16 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 11 Dec 2013 14:25:07 +0000
Subject: [PATCH] Add rust-encoding as a submodule.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream: https://github.com/lifthrasiir/rust-encoding
Servo’s fork: https://github.com/mozilla-servo/rust-encoding

As of this writing, upstream’s master branch targets Rust 0.8,
and its rust-0.9-pre branch targets Rust master.
Servo uses a Rust version in-between those.
I pushed a rust-servo branch to our fork
that backports from rust-0.9-pre.
---
 .gitmodules                        | 4 ++++
 configure                          | 1 +
 mk/sub.mk                          | 9 +++++++++
 src/support/encoding/rust-encoding | 1 +
 4 files changed, 15 insertions(+)
 create mode 160000 src/support/encoding/rust-encoding

diff --git a/.gitmodules b/.gitmodules
index 6e01b1c87fc..e9d92f3f743 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,7 @@
 [submodule "src/support/http/rust-http"]
 	path = src/support/http/rust-http
 	url = https://github.com/mozilla-servo/rust-http
+[submodule "src/support/encoding/rust-encoding"]
+	path = src/support/encoding/rust-encoding
+	url = https://github.com/mozilla-servo/rust-encoding.git
+	branch = rust-servo
diff --git a/configure b/configure
index 5de771e9268..e870f7b50f4 100755
--- a/configure
+++ b/configure
@@ -498,6 +498,7 @@ CFG_SUBMODULES="\
     support/alert/rust-alert \
     support/azure/rust-azure \
     support/css/rust-cssparser \
+    support/encoding/rust-encoding \
     support/harfbuzz/rust-harfbuzz \
     support/http/rust-http \
     support/hubbub/libhubbub \
diff --git a/mk/sub.mk b/mk/sub.mk
index d4ccf03883c..da506cb2b1a 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -50,6 +50,15 @@ DEPS_rust-azure += \
 	rust \
 	$(NULL)
 
+DEPS_rust-cssparser += \
+	rust-encoding \
+	rust \
+	$(NULL)
+
+DEPS_rust-encoding += \
+	rust \
+	$(NULL)
+
 DEPS_glfw-rs += \
 	glfw \
 	rust \
diff --git a/src/support/encoding/rust-encoding b/src/support/encoding/rust-encoding
new file mode 160000
index 00000000000..2c486a34ded
--- /dev/null
+++ b/src/support/encoding/rust-encoding
@@ -0,0 +1 @@
+Subproject commit 2c486a34dedba1faace3de641e0ace103c7f3145