From 1924df0c00030d973c18036c5a16cccae252fcc6 Mon Sep 17 00:00:00 2001
From: Ravi Shankar <wafflespeanut@gmail.com>
Date: Tue, 27 Sep 2016 17:35:40 +0530
Subject: [PATCH 1/2] Update README for bindgen tools

---
 components/style/binding_tools/README.md | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/components/style/binding_tools/README.md b/components/style/binding_tools/README.md
index dbd9ae4526d..5b23c7a57bb 100644
--- a/components/style/binding_tools/README.md
+++ b/components/style/binding_tools/README.md
@@ -1,26 +1,12 @@
-# GeckoLib tools
+# Geckolib tools
 
-This directory contains mostly simple tools for working with
-[stylo](https://public.etherpad-mozilla.org/p/stylo).
-
-Some scripts require [multirust](https://github.com/brson/multirust) in order to
-work.
-
-You can see a description of them below.
+This directory contains simple tools for generating the Rust bindings for [stylo](https://public.etherpad-mozilla.org/p/stylo).
 
 ## `setup_bindgen.sh`
 
-This uses downloads a custom version of bindgen, up to date to generate the
-bindings, and uses the required `llvm38` to build it.
+This clones Servo's version of bindgen, and uses `llvm-3.8` library to build it. It will then be used to generate the Rust bindings.
 
-It will also rebuild it if it's already downloaded.
-
-## `regen_bindings.sh`
+## `regen.sh`
 
 This will regenerate the bindings for the `ServoBindings.h` file in your gecko
-build (which are in `ports/geckolib/bindings.rs`).
-
-## `regen_style_structs.sh`
-
-This will generate the bindings for Gecko's style structs. Current bindings are
-actually in `ports/geckolib/structs.rs`.
+build. The generated bindings live in `components/style/gecko_bindings/bindings.rs`. For structs, the bindings are in `components/style/gecko_bindings/structs_*`

From 67d26b36a1fb97441ee2d0013f9501d8bd081663 Mon Sep 17 00:00:00 2001
From: Ravi Shankar <wafflespeanut@gmail.com>
Date: Tue, 27 Sep 2016 17:36:20 +0530
Subject: [PATCH 2/2] Minor cleanup to the bindgen scripts

---
 components/style/binding_tools/regen.sh         |  8 +++++---
 components/style/binding_tools/setup_bindgen.sh | 17 +++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/components/style/binding_tools/regen.sh b/components/style/binding_tools/regen.sh
index fc2ed08a833..d08e17116b0 100755
--- a/components/style/binding_tools/regen.sh
+++ b/components/style/binding_tools/regen.sh
@@ -8,13 +8,15 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+TOOLS_DIR="$(dirname ${0})"
+
 if [[ ${#} -eq 0 ]]; then
   echo "Usage: ${0} /path/to/gecko/objdir [other-regen.py-flags]"
   exit 1
 fi
 
 # Check for rust-bindgen
-if [[ ! -d rust-bindgen ]]; then
+if [[ ! -d "${TOOLS_DIR}/rust-bindgen" ]]; then
   echo "rust-bindgen not found. Run setup_bindgen.sh first."
   exit 1
 fi
@@ -22,7 +24,7 @@ fi
 # Check for /usr/include
 if [[ ! -d /usr/include ]]; then
   echo "/usr/include doesn't exist." \
-       "Mac users may need to run xcode-select --install."
+       "Mac users may need to run 'xcode-select --install.'"
   exit 1
 fi
 
@@ -32,4 +34,4 @@ else
   LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib"
 fi
 
-./regen.py --target all "${@}"
+"./${TOOLS_DIR}/regen.py" --target all "${@}"
diff --git a/components/style/binding_tools/setup_bindgen.sh b/components/style/binding_tools/setup_bindgen.sh
index 4d1b67e3f43..cb0c5f175db 100755
--- a/components/style/binding_tools/setup_bindgen.sh
+++ b/components/style/binding_tools/setup_bindgen.sh
@@ -18,28 +18,21 @@ else
   export LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib"
 fi
 
-# Make sure we have llvm38.
+# Make sure we have llvm-3.8.
 if [[ ! -x "$(command -v clang-3.8)" ]]; then
-    echo "llmv38 must be installed." \
-         "Mac users should |brew install llvm38|, Linux varies by distro."
-    exit 1
+  echo "llvm-3.8 is required." \
+       "Mac users should |brew install llvm38|," \
+       "Linux users can find it in clang-3.8."
+  exit 1
 fi
 
 export LD_LIBRARY_PATH="${LIBCLANG_PATH}"
 export DYLD_LIBRARY_PATH="${LIBCLANG_PATH}"
 
-# Check for multirust
-if [[ ! -x "$(command -v multirust)" ]]; then
-    echo "multirust must be installed."
-    exit 1
-fi
-
 # Don't try to clone twice.
 if [[ ! -d rust-bindgen ]]; then
   git clone https://github.com/servo/rust-bindgen.git
 fi
 
 cd rust-bindgen
-
-multirust override nightly
 cargo build --features llvm_stable