Merge the cli and test-runner packages

Shouldn't be any need to have them versioned separately!

.cargo/config

@@ -1,4 +1,4 @@
 # TODO: we shouldn't check this in to git, need to figure out how to avoid doing
 # that.
 [target.wasm32-unknown-unknown]
-runner = 'cargo +nightly run --release -p wasm-bindgen-test-runner --'
+runner = 'cargo +nightly run --release -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'

.travis.yml

@@ -13,7 +13,7 @@ DEPLOY_TO_GITHUB: &DEPLOY_TO_GITHUB
     |
       name="wasm-bindgen-$TRAVIS_TAG-$TARGET"
       mkdir "$name"
-      cp "target/$TARGET/release/{wasm-bindgen,wasm2es6js}" "$name/"
+      cp "target/$TARGET/release/{wasm-bindgen,wasm2es6js,wasm-bindgen-test-runner}" "$name/"
       cp README.md LICENSE-MIT LICENSE-APACHE "$name/"
       tar czvf "$name.tar.gz" "$name"
   deploy:

Cargo.toml

@@ -39,7 +39,6 @@ members = [
   "crates/cli",
   "crates/js-sys",
   "crates/test",
-  "crates/test-runner",
   "crates/typescript",
   "crates/web-sys",
   "crates/webidl",

crates/cli/Cargo.toml

@@ -19,3 +19,4 @@ serde = "1.0"
 serde_derive = "1.0"
 wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.12" }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.12" }
+parity-wasm = "0.31"

crates/test-runner/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "wasm-bindgen-test-runner"
-version = "0.2.12"
-authors = ["The wasm-bindgen Developers"]
-
-[dependencies]
-wasm-bindgen-cli-support = { path = '../cli-support', version = '=0.2.12' }
-failure = "0.1"
-parity-wasm = "0.31"

crates/test-runner/README.md

@@ -1,5 +0,0 @@
-# wasm-bindgen-test-runner
-
-This is an **experimental** crate for enabling `cargo test --target
-wasm32-unknown-unknown`. For more information see the README fo
-`wasm-bindgen-test`.

crates/test/README.md

@@ -14,9 +14,11 @@ ton of documentation just yet, but a taste of how it works is:
 * First, install the test runner.
 
   ```
-  cargo install --path crates/test-runner
+  cargo install --path crates/cli
   ```
 
+  (this comes with the normal `wasm-bindgen` CLI tool
+
 * Next, add this to your `.cargo/config`:
 
   ```toml