From 0645a50526dce403e2a454cbf02e138925fa706d Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Mon, 29 Oct 2018 01:48:33 -0700
Subject: [PATCH] Use 'compiletest' from git.

---
 codegen/Cargo.toml |  2 +-
 scripts/publish.sh | 31 +++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
index ff340b58..0fe5764f 100644
--- a/codegen/Cargo.toml
+++ b/codegen/Cargo.toml
@@ -19,7 +19,7 @@ rocket = { version = "0.3.17", path = "../lib/" }
 log = "0.3"
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3", features = ["stable"] }
+compiletest_rs = { git = "https://github.com/laumann/compiletest-rs" }
 
 [build-dependencies]
 yansi = "0.4"
diff --git a/scripts/publish.sh b/scripts/publish.sh
index 9113ddcd..1ff6a716 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# Publishes the current versions of core, contrib, and codegen to crates.io.
+# Publishes the current versions of all Rocket crates to crates.io.
 #
 
 # Brings in: ROOT_DIR, EXAMPLES_DIR, LIB_DIR, CODEGEN_DIR, CONTRIB_DIR, DOC_DIR
@@ -14,17 +14,25 @@ if ! [ -z "$(git status --porcelain)" ]; then
   exit 1
 fi
 
+function strip_dev_dependencies() {
+  perl -i.bak -p0e 's/\[dev-dependencies\][^\[]*//smg' "${1}/Cargo.toml"
+}
+
+function restore_dev_dependencies() {
+  mv "${1}/Cargo.toml.bak" "${1}/Cargo.toml"
+}
+
 # Ensure everything passes before trying to publish.
-echo ":::: Running test suite [debug]..."
+echo ":::: Running test suite..."
 cargo clean
 bash "${SCRIPT_DIR}/test.sh"
+bash "${SCRIPT_DIR}/test.sh --release"
 
-echo ":::: Running test suite [release]..."
-cargo clean
-bash "${SCRIPT_DIR}/test.sh" --release
-
-# Temporarily remove the dependency on codegen from core so crates.io verifies.
-sed -i.bak 's/rocket_codegen.*//' "${LIB_DIR}/Cargo.toml"
+# Temporarily remove dev-dependencies so crates.io verifies.
+echo ":::: Stripping [dev-dependencies]..."
+for dir in "${LIB_DIR}" "${CODEGEN_DIR}" "${CONTRIB_DIR}"; do
+  strip_dev_dependencies "${dir}"
+done
 
 # Publish all the things.
 for dir in "${LIB_DIR}" "${CODEGEN_DIR}" "${CONTRIB_DIR}"; do
@@ -35,5 +43,8 @@ for dir in "${LIB_DIR}" "${CODEGEN_DIR}" "${CONTRIB_DIR}"; do
   popd
 done
 
-# Restore the original core Cargo.toml.
-mv "${LIB_DIR}/Cargo.toml.bak" "${LIB_DIR}/Cargo.toml"
+# Restore dev-dependencies.
+echo ":::: Restoring [dev-dependencies]..."
+for dir in "${LIB_DIR}" "${CODEGEN_DIR}" "${CONTRIB_DIR}"; do
+  restore_dev_dependencies "${dir}"
+done