From 393841779ac337512e7541d983c496683a245004 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Thu, 29 Mar 2018 08:15:58 -0700
Subject: [PATCH] Rename directories to remove "wasm-bindgen-" prefix in
 sub-crates

---
 Cargo.toml                                                    | 4 ++--
 crates/{wasm-bindgen-cli-support => cli-support}/Cargo.toml   | 2 +-
 .../{wasm-bindgen-cli-support => cli-support}/LICENSE-APACHE  | 0
 crates/{wasm-bindgen-cli-support => cli-support}/LICENSE-MIT  | 0
 crates/{wasm-bindgen-cli-support => cli-support}/src/js.rs    | 0
 crates/{wasm-bindgen-cli-support => cli-support}/src/lib.rs   | 0
 .../src/wasm2es6js.rs                                         | 0
 crates/{wasm-bindgen-cli => cli}/Cargo.toml                   | 4 ++--
 crates/{wasm-bindgen-cli => cli}/src/bin/wasm-bindgen.rs      | 0
 crates/{wasm-bindgen-cli => cli}/src/bin/wasm2es6js.rs        | 0
 crates/{wasm-bindgen-macro => macro}/Cargo.toml               | 2 +-
 crates/{wasm-bindgen-macro => macro}/LICENSE-APACHE           | 0
 crates/{wasm-bindgen-macro => macro}/LICENSE-MIT              | 0
 crates/{wasm-bindgen-macro => macro}/src/ast.rs               | 0
 crates/{wasm-bindgen-macro => macro}/src/lib.rs               | 0
 crates/{wasm-bindgen-macro => macro}/src/literal.rs           | 0
 crates/{wasm-bindgen-shared => shared}/Cargo.toml             | 0
 crates/{wasm-bindgen-shared => shared}/LICENSE-APACHE         | 0
 crates/{wasm-bindgen-shared => shared}/LICENSE-MIT            | 0
 crates/{wasm-bindgen-shared => shared}/build.rs               | 0
 crates/{wasm-bindgen-shared => shared}/src/lib.rs             | 0
 crates/test-support/Cargo.toml                                | 2 +-
 22 files changed, 7 insertions(+), 7 deletions(-)
 rename crates/{wasm-bindgen-cli-support => cli-support}/Cargo.toml (86%)
 rename crates/{wasm-bindgen-cli-support => cli-support}/LICENSE-APACHE (100%)
 rename crates/{wasm-bindgen-cli-support => cli-support}/LICENSE-MIT (100%)
 rename crates/{wasm-bindgen-cli-support => cli-support}/src/js.rs (100%)
 rename crates/{wasm-bindgen-cli-support => cli-support}/src/lib.rs (100%)
 rename crates/{wasm-bindgen-cli-support => cli-support}/src/wasm2es6js.rs (100%)
 rename crates/{wasm-bindgen-cli => cli}/Cargo.toml (81%)
 rename crates/{wasm-bindgen-cli => cli}/src/bin/wasm-bindgen.rs (100%)
 rename crates/{wasm-bindgen-cli => cli}/src/bin/wasm2es6js.rs (100%)
 rename crates/{wasm-bindgen-macro => macro}/Cargo.toml (88%)
 rename crates/{wasm-bindgen-macro => macro}/LICENSE-APACHE (100%)
 rename crates/{wasm-bindgen-macro => macro}/LICENSE-MIT (100%)
 rename crates/{wasm-bindgen-macro => macro}/src/ast.rs (100%)
 rename crates/{wasm-bindgen-macro => macro}/src/lib.rs (100%)
 rename crates/{wasm-bindgen-macro => macro}/src/literal.rs (100%)
 rename crates/{wasm-bindgen-shared => shared}/Cargo.toml (100%)
 rename crates/{wasm-bindgen-shared => shared}/LICENSE-APACHE (100%)
 rename crates/{wasm-bindgen-shared => shared}/LICENSE-MIT (100%)
 rename crates/{wasm-bindgen-shared => shared}/build.rs (100%)
 rename crates/{wasm-bindgen-shared => shared}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index f9a73ee8..12c68fe4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,14 +17,14 @@ test = false
 doctest = false
 
 [dependencies]
-wasm-bindgen-macro = { path = "crates/wasm-bindgen-macro", version = "0.1" }
+wasm-bindgen-macro = { path = "crates/macro", version = "0.1" }
 
 [dev-dependencies]
 test-support = { path = "crates/test-support" }
 
 [workspace]
 members = [
-  "crates/wasm-bindgen-cli",
+  "crates/cli",
   "examples/hello_world",
   "examples/smorgasboard",
   "examples/console_log",
diff --git a/crates/wasm-bindgen-cli-support/Cargo.toml b/crates/cli-support/Cargo.toml
similarity index 86%
rename from crates/wasm-bindgen-cli-support/Cargo.toml
rename to crates/cli-support/Cargo.toml
index c73ef980..91a89569 100644
--- a/crates/wasm-bindgen-cli-support/Cargo.toml
+++ b/crates/cli-support/Cargo.toml
@@ -14,5 +14,5 @@ Shared support for the wasm-bindgen-cli package, an internal dependency
 base64 = "0.9"
 parity-wasm = "0.27"
 serde_json = "1.0"
-wasm-bindgen-shared = { path = "../wasm-bindgen-shared", version = '0.1' }
+wasm-bindgen-shared = { path = "../shared", version = '0.1' }
 wasm-gc-api = "0.1"
diff --git a/crates/wasm-bindgen-cli-support/LICENSE-APACHE b/crates/cli-support/LICENSE-APACHE
similarity index 100%
rename from crates/wasm-bindgen-cli-support/LICENSE-APACHE
rename to crates/cli-support/LICENSE-APACHE
diff --git a/crates/wasm-bindgen-cli-support/LICENSE-MIT b/crates/cli-support/LICENSE-MIT
similarity index 100%
rename from crates/wasm-bindgen-cli-support/LICENSE-MIT
rename to crates/cli-support/LICENSE-MIT
diff --git a/crates/wasm-bindgen-cli-support/src/js.rs b/crates/cli-support/src/js.rs
similarity index 100%
rename from crates/wasm-bindgen-cli-support/src/js.rs
rename to crates/cli-support/src/js.rs
diff --git a/crates/wasm-bindgen-cli-support/src/lib.rs b/crates/cli-support/src/lib.rs
similarity index 100%
rename from crates/wasm-bindgen-cli-support/src/lib.rs
rename to crates/cli-support/src/lib.rs
diff --git a/crates/wasm-bindgen-cli-support/src/wasm2es6js.rs b/crates/cli-support/src/wasm2es6js.rs
similarity index 100%
rename from crates/wasm-bindgen-cli-support/src/wasm2es6js.rs
rename to crates/cli-support/src/wasm2es6js.rs
diff --git a/crates/wasm-bindgen-cli/Cargo.toml b/crates/cli/Cargo.toml
similarity index 81%
rename from crates/wasm-bindgen-cli/Cargo.toml
rename to crates/cli/Cargo.toml
index bf6e4195..8390ee42 100644
--- a/crates/wasm-bindgen-cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -17,8 +17,8 @@ docopt = "0.8"
 parity-wasm = "0.27"
 serde = "1.0"
 serde_derive = "1.0"
-wasm-bindgen-cli-support = { path = "../wasm-bindgen-cli-support", version = "0.1.1" }
-wasm-bindgen-shared = { path = "../wasm-bindgen-shared", version = "0.1" }
+wasm-bindgen-cli-support = { path = "../cli-support", version = "0.1.1" }
+wasm-bindgen-shared = { path = "../shared", version = "0.1" }
 
 [[bin]]
 name = "wasm-bindgen"
diff --git a/crates/wasm-bindgen-cli/src/bin/wasm-bindgen.rs b/crates/cli/src/bin/wasm-bindgen.rs
similarity index 100%
rename from crates/wasm-bindgen-cli/src/bin/wasm-bindgen.rs
rename to crates/cli/src/bin/wasm-bindgen.rs
diff --git a/crates/wasm-bindgen-cli/src/bin/wasm2es6js.rs b/crates/cli/src/bin/wasm2es6js.rs
similarity index 100%
rename from crates/wasm-bindgen-cli/src/bin/wasm2es6js.rs
rename to crates/cli/src/bin/wasm2es6js.rs
diff --git a/crates/wasm-bindgen-macro/Cargo.toml b/crates/macro/Cargo.toml
similarity index 88%
rename from crates/wasm-bindgen-macro/Cargo.toml
rename to crates/macro/Cargo.toml
index da770850..3a0dfe87 100644
--- a/crates/wasm-bindgen-macro/Cargo.toml
+++ b/crates/macro/Cargo.toml
@@ -18,4 +18,4 @@ syn = { version = '0.12', features = ['full'] }
 quote = '0.4'
 proc-macro2 = { version = "0.2", features = ["nightly"] }
 serde_json = "1"
-wasm-bindgen-shared = { path = "../wasm-bindgen-shared", version = "0.1.0" }
+wasm-bindgen-shared = { path = "../shared", version = "0.1.0" }
diff --git a/crates/wasm-bindgen-macro/LICENSE-APACHE b/crates/macro/LICENSE-APACHE
similarity index 100%
rename from crates/wasm-bindgen-macro/LICENSE-APACHE
rename to crates/macro/LICENSE-APACHE
diff --git a/crates/wasm-bindgen-macro/LICENSE-MIT b/crates/macro/LICENSE-MIT
similarity index 100%
rename from crates/wasm-bindgen-macro/LICENSE-MIT
rename to crates/macro/LICENSE-MIT
diff --git a/crates/wasm-bindgen-macro/src/ast.rs b/crates/macro/src/ast.rs
similarity index 100%
rename from crates/wasm-bindgen-macro/src/ast.rs
rename to crates/macro/src/ast.rs
diff --git a/crates/wasm-bindgen-macro/src/lib.rs b/crates/macro/src/lib.rs
similarity index 100%
rename from crates/wasm-bindgen-macro/src/lib.rs
rename to crates/macro/src/lib.rs
diff --git a/crates/wasm-bindgen-macro/src/literal.rs b/crates/macro/src/literal.rs
similarity index 100%
rename from crates/wasm-bindgen-macro/src/literal.rs
rename to crates/macro/src/literal.rs
diff --git a/crates/wasm-bindgen-shared/Cargo.toml b/crates/shared/Cargo.toml
similarity index 100%
rename from crates/wasm-bindgen-shared/Cargo.toml
rename to crates/shared/Cargo.toml
diff --git a/crates/wasm-bindgen-shared/LICENSE-APACHE b/crates/shared/LICENSE-APACHE
similarity index 100%
rename from crates/wasm-bindgen-shared/LICENSE-APACHE
rename to crates/shared/LICENSE-APACHE
diff --git a/crates/wasm-bindgen-shared/LICENSE-MIT b/crates/shared/LICENSE-MIT
similarity index 100%
rename from crates/wasm-bindgen-shared/LICENSE-MIT
rename to crates/shared/LICENSE-MIT
diff --git a/crates/wasm-bindgen-shared/build.rs b/crates/shared/build.rs
similarity index 100%
rename from crates/wasm-bindgen-shared/build.rs
rename to crates/shared/build.rs
diff --git a/crates/wasm-bindgen-shared/src/lib.rs b/crates/shared/src/lib.rs
similarity index 100%
rename from crates/wasm-bindgen-shared/src/lib.rs
rename to crates/shared/src/lib.rs
diff --git a/crates/test-support/Cargo.toml b/crates/test-support/Cargo.toml
index 0667ca84..ff8bfab4 100644
--- a/crates/test-support/Cargo.toml
+++ b/crates/test-support/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 
 [dependencies]
-wasm-bindgen-cli-support = { path = "../wasm-bindgen-cli-support" }
+wasm-bindgen-cli-support = { path = "../cli-support" }