From a7d84afeb4e30dafe37181deb5b655e9ac01bb77 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Fri, 20 Mar 2020 16:30:37 -0700
Subject: [PATCH] Remove the old wast and wasm2obj commands. (#1372)

* Remove the old wast and wasm2obj commands.

These are subsumed by the `wasmtime wast` and `wasmtime wasm2obj` commands.

Fixes #827.

* Remove wasm2obj install commands.
---
 .github/workflows/main.yml |  6 +++---
 ci/build-tarballs.sh       |  4 ++--
 ci/wasmtime.wxs            |  6 +-----
 src/bin/wasm2obj.rs        | 12 ------------
 src/bin/wast.rs            | 12 ------------
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 src/bin/wasm2obj.rs
 delete mode 100644 src/bin/wast.rs

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 190516ad21..cac3dd23fe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -364,7 +364,7 @@ jobs:
     - run: rustup target add wasm32-wasi
 
     # Build `wasmtime` and executables
-    - run: $CENTOS cargo build --release --bin wasmtime --bin wasm2obj
+    - run: $CENTOS cargo build --release --bin wasmtime
       shell: bash
     # Build `libwasmtime.so`
     - run: $CENTOS cargo build --release --manifest-path crates/c-api/Cargo.toml
@@ -388,9 +388,9 @@ jobs:
       shell: bash
 
     # Move binaries to dist folder
-    - run: cp target/release/{wasmtime,wasm2obj} dist
+    - run: cp target/release/wasmtime dist
       if: matrix.os != 'windows-latest'
-    - run: cp target/release/{wasmtime,wasm2obj}.exe dist
+    - run: cp target/release/wasmtime.exe dist
       shell: bash
       if: matrix.os == 'windows-latest'
 
diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh
index 3aedcfa10b..5603e1b59e 100755
--- a/ci/build-tarballs.sh
+++ b/ci/build-tarballs.sh
@@ -33,8 +33,8 @@ mktarball() {
 bin_pkgname=wasmtime-$TAG-$platform
 mkdir tmp/$bin_pkgname
 cp LICENSE README.md tmp/$bin_pkgname
-mv bins-$src/{wasmtime,wasm2obj}$exe tmp/$bin_pkgname
-chmod +x tmp/$bin_pkgname/{wasmtime,wasm2obj}$exe
+mv bins-$src/wasmtime$exe tmp/$bin_pkgname
+chmod +x tmp/$bin_pkgname/wasmtime$exe
 mktarball $bin_pkgname
 
 if [ "$exe" = ".exe" ]; then
diff --git a/ci/wasmtime.wxs b/ci/wasmtime.wxs
index 8110932cb9..ec3a58f9aa 100644
--- a/ci/wasmtime.wxs
+++ b/ci/wasmtime.wxs
@@ -64,14 +64,10 @@
             <Component Id="wasmtime.exe" Guid="*">
                 <File Id="wasmtime.exe" Source="target\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
             </Component>
-            <Component Id="wasm2obj.exe" Guid="*">
-                <File Id="wasm2obj.exe" Source="target\release\wasm2obj.exe" KeyPath="yes" Checksum="yes"/>
-            </Component>
         </DirectoryRef>
 
-        <Feature Id="InstallWasmtime" Title="Wasmtime and Wasm2obj" Level="1">
+        <Feature Id="InstallWasmtime" Title="Wasmtime" Level="1">
             <ComponentRef Id="wasmtime.exe" />
-            <ComponentRef Id="wasm2obj.exe" />
             <ComponentRef Id="LICENSE" />
             <ComponentRef Id="README" />
             <ComponentRef Id="InstallDir" />
diff --git a/src/bin/wasm2obj.rs b/src/bin/wasm2obj.rs
deleted file mode 100644
index 12e02b3e20..0000000000
--- a/src/bin/wasm2obj.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! The `wasm2obj` command line tool.
-//!
-//! Translates WebAssembly modules to object files.
-//! See `wasm2obj --help` for usage.
-
-use anyhow::Result;
-use structopt::StructOpt;
-use wasmtime_cli::commands::WasmToObjCommand;
-
-fn main() -> Result<()> {
-    WasmToObjCommand::from_args().execute()
-}
diff --git a/src/bin/wast.rs b/src/bin/wast.rs
deleted file mode 100644
index 1407a7eb67..0000000000
--- a/src/bin/wast.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! The `wast` command line tool.
-//!
-//! Runs WebAssembly test script files.
-//! See `wast --help` for usage.
-
-use anyhow::Result;
-use structopt::StructOpt;
-use wasmtime_cli::commands::WastCommand;
-
-fn main() -> Result<()> {
-    WastCommand::from_args().execute()
-}