From f9734458f83de11d6e9a44bffa5d263b5a95d3f6 Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <stoklund@2pi.dk>
Date: Mon, 17 Oct 2016 14:57:42 -0700
Subject: [PATCH] Promote the src/tools crate to the top-level workspace.

The 'src' and 'tests' top-level directories now contain tools sources
and integration tests for any of the library crates.
---
 cranelift/Cargo.toml                          | 24 +++++++++++++++++--
 cranelift/{src => }/format-all.sh             |  0
 cranelift/src/{tools => }/cat.rs              |  0
 cranelift/src/{tools/main.rs => cton-util.rs} |  0
 .../src/{tools => }/filetest/concurrent.rs    |  0
 cranelift/src/{tools => }/filetest/domtree.rs |  0
 .../src/{tools => }/filetest/legalizer.rs     |  0
 cranelift/src/{tools => }/filetest/mod.rs     |  0
 cranelift/src/{tools => }/filetest/runner.rs  |  0
 cranelift/src/{tools => }/filetest/runone.rs  |  0
 cranelift/src/{tools => }/filetest/subtest.rs |  0
 .../src/{tools => }/filetest/verifier.rs      |  0
 cranelift/src/{tools => }/print_cfg.rs        |  0
 cranelift/src/{tools => }/rsfilecheck.rs      |  0
 cranelift/src/tools/Cargo.toml                | 18 --------------
 cranelift/src/{tools => }/utils.rs            |  0
 cranelift/test-all.sh                         |  6 ++---
 .../{src/tools => }/tests/cfg_traversal.rs    |  0
 18 files changed, 25 insertions(+), 23 deletions(-)
 rename cranelift/{src => }/format-all.sh (100%)
 rename cranelift/src/{tools => }/cat.rs (100%)
 rename cranelift/src/{tools/main.rs => cton-util.rs} (100%)
 rename cranelift/src/{tools => }/filetest/concurrent.rs (100%)
 rename cranelift/src/{tools => }/filetest/domtree.rs (100%)
 rename cranelift/src/{tools => }/filetest/legalizer.rs (100%)
 rename cranelift/src/{tools => }/filetest/mod.rs (100%)
 rename cranelift/src/{tools => }/filetest/runner.rs (100%)
 rename cranelift/src/{tools => }/filetest/runone.rs (100%)
 rename cranelift/src/{tools => }/filetest/subtest.rs (100%)
 rename cranelift/src/{tools => }/filetest/verifier.rs (100%)
 rename cranelift/src/{tools => }/print_cfg.rs (100%)
 rename cranelift/src/{tools => }/rsfilecheck.rs (100%)
 delete mode 100644 cranelift/src/tools/Cargo.toml
 rename cranelift/src/{tools => }/utils.rs (100%)
 rename cranelift/{src/tools => }/tests/cfg_traversal.rs (100%)

diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index 63597ad428..d0da28f918 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -1,3 +1,23 @@
-# Phantom workspace manifest for all Cretonne crates.
+[package]
+name = "cretonne-tools"
+authors = ["The Cretonne Project Developers"]
+version = "0.0.0"
+description = "Binaries for testing the Cretonne library"
+license = "Apache-2.0"
+documentation = "https://cretonne.readthedocs.io/"
+repository = "https://github.com/stoklund/cretonne"
+publish = false
+
+[[bin]]
+name = "cton-util"
+path = "src/cton-util.rs"
+
+[dependencies]
+cretonne = { path = "lib/cretonne" }
+cretonne-reader = { path = "lib/reader" }
+filecheck = { path = "lib/filecheck" }
+docopt = "0.6.86"
+rustc-serialize = "0.3.19"
+num_cpus = "1.1.0"
+
 [workspace]
-members = ["src/tools"]
diff --git a/cranelift/src/format-all.sh b/cranelift/format-all.sh
similarity index 100%
rename from cranelift/src/format-all.sh
rename to cranelift/format-all.sh
diff --git a/cranelift/src/tools/cat.rs b/cranelift/src/cat.rs
similarity index 100%
rename from cranelift/src/tools/cat.rs
rename to cranelift/src/cat.rs
diff --git a/cranelift/src/tools/main.rs b/cranelift/src/cton-util.rs
similarity index 100%
rename from cranelift/src/tools/main.rs
rename to cranelift/src/cton-util.rs
diff --git a/cranelift/src/tools/filetest/concurrent.rs b/cranelift/src/filetest/concurrent.rs
similarity index 100%
rename from cranelift/src/tools/filetest/concurrent.rs
rename to cranelift/src/filetest/concurrent.rs
diff --git a/cranelift/src/tools/filetest/domtree.rs b/cranelift/src/filetest/domtree.rs
similarity index 100%
rename from cranelift/src/tools/filetest/domtree.rs
rename to cranelift/src/filetest/domtree.rs
diff --git a/cranelift/src/tools/filetest/legalizer.rs b/cranelift/src/filetest/legalizer.rs
similarity index 100%
rename from cranelift/src/tools/filetest/legalizer.rs
rename to cranelift/src/filetest/legalizer.rs
diff --git a/cranelift/src/tools/filetest/mod.rs b/cranelift/src/filetest/mod.rs
similarity index 100%
rename from cranelift/src/tools/filetest/mod.rs
rename to cranelift/src/filetest/mod.rs
diff --git a/cranelift/src/tools/filetest/runner.rs b/cranelift/src/filetest/runner.rs
similarity index 100%
rename from cranelift/src/tools/filetest/runner.rs
rename to cranelift/src/filetest/runner.rs
diff --git a/cranelift/src/tools/filetest/runone.rs b/cranelift/src/filetest/runone.rs
similarity index 100%
rename from cranelift/src/tools/filetest/runone.rs
rename to cranelift/src/filetest/runone.rs
diff --git a/cranelift/src/tools/filetest/subtest.rs b/cranelift/src/filetest/subtest.rs
similarity index 100%
rename from cranelift/src/tools/filetest/subtest.rs
rename to cranelift/src/filetest/subtest.rs
diff --git a/cranelift/src/tools/filetest/verifier.rs b/cranelift/src/filetest/verifier.rs
similarity index 100%
rename from cranelift/src/tools/filetest/verifier.rs
rename to cranelift/src/filetest/verifier.rs
diff --git a/cranelift/src/tools/print_cfg.rs b/cranelift/src/print_cfg.rs
similarity index 100%
rename from cranelift/src/tools/print_cfg.rs
rename to cranelift/src/print_cfg.rs
diff --git a/cranelift/src/tools/rsfilecheck.rs b/cranelift/src/rsfilecheck.rs
similarity index 100%
rename from cranelift/src/tools/rsfilecheck.rs
rename to cranelift/src/rsfilecheck.rs
diff --git a/cranelift/src/tools/Cargo.toml b/cranelift/src/tools/Cargo.toml
deleted file mode 100644
index 930256d8bb..0000000000
--- a/cranelift/src/tools/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-authors = ["The Cretonne Project Developers"]
-name = "cretonne-tools"
-version = "0.0.0"
-description = "Binaries for testing the Cretonne library"
-publish = false
-
-[[bin]]
-name = "cton-util"
-path = "main.rs"
-
-[dependencies]
-cretonne = { path = "../../lib/cretonne" }
-cretonne-reader = { path = "../../lib/reader" }
-filecheck = { path = "../../lib/filecheck" }
-docopt = "0.6.80"
-rustc-serialize = "0.3.19"
-num_cpus = "1.1.0"
diff --git a/cranelift/src/tools/utils.rs b/cranelift/src/utils.rs
similarity index 100%
rename from cranelift/src/tools/utils.rs
rename to cranelift/src/utils.rs
diff --git a/cranelift/test-all.sh b/cranelift/test-all.sh
index 843b1e82be..0ad58aa114 100755
--- a/cranelift/test-all.sh
+++ b/cranelift/test-all.sh
@@ -34,14 +34,14 @@ RUSTFMT_VERSION="0.6.2"
 
 if cargo install --list | grep -q "^rustfmt v$RUSTFMT_VERSION"; then
     banner "Rust formatting"
-    $topdir/src/format-all.sh --write-mode=diff
+    $topdir/format-all.sh --write-mode=diff
 else
     echo "Please install rustfmt v$RUSTFMT_VERSION to verify formatting."
     echo "If a newer version of rustfmt is available, update this script."
 fi
 
 PKGS="cretonne cretonne-reader cretonne-tools filecheck"
-cd "$topdir/src/tools"
+cd "$topdir"
 for PKG in $PKGS
 do
     banner "Rust $PKG unit tests"
@@ -49,7 +49,7 @@ do
 done
 
 # Build cton-util for parser testing.
-cd "$topdir/src/tools"
+cd "$topdir"
 banner "Rust documentation"
 echo "open $topdir/target/doc/cretonne/index.html"
 cargo doc
diff --git a/cranelift/src/tools/tests/cfg_traversal.rs b/cranelift/tests/cfg_traversal.rs
similarity index 100%
rename from cranelift/src/tools/tests/cfg_traversal.rs
rename to cranelift/tests/cfg_traversal.rs