From 79baafd584a39de4130129a206028bf8dcc6625b Mon Sep 17 00:00:00 2001
From: Brandon Williams <bmwill@calibra.com>
Date: Thu, 24 Oct 2019 23:51:26 -0700
Subject: [PATCH] [x] rename xtask to x

Closes: #1519
Approved by: metajack
---
 .cargo/config                      |  3 ++-
 .circleci/config.yml               |  2 +-
 Cargo.lock                         | 16 ++++++++--------
 Cargo.toml                         |  2 +-
 documentation/coding_guidelines.md |  2 +-
 {xtask => x}/Cargo.toml            |  2 +-
 {xtask => x}/src/main.rs           |  0
 {xtask => x}/src/test_unit.rs      |  0
 8 files changed, 14 insertions(+), 13 deletions(-)
 rename {xtask => x}/Cargo.toml (94%)
 rename {xtask => x}/src/main.rs (100%)
 rename {xtask => x}/src/test_unit.rs (100%)

diff --git a/.cargo/config b/.cargo/config
index 86281707cc5d7..575b1b0975d9c 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,2 +1,3 @@
 [alias]
-xtask = "run --package xtask --bin xtask --"
+x = "run --package x --bin x --"
+xtask = "run --package x --bin x --"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 176dd348f81db..9092f137f8dfa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,7 +87,7 @@ jobs:
       - run:
           name: Run All Unit Tests
           command: |
-            [[ $CIRCLE_NODE_INDEX =~ [013] ]] || RUST_BACKTRACE=1 cargo xtask test-unit
+            [[ $CIRCLE_NODE_INDEX =~ [013] ]] || RUST_BACKTRACE=1 cargo x test-unit
       - run:
           name: Run Cryptography Unit Tests with the formally verified backend
           command: |
diff --git a/Cargo.lock b/Cargo.lock
index a58adbb318cdc..1735440600e5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5375,6 +5375,14 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "x"
+version = "0.1.0"
+dependencies = [
+ "structopt 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "0.5.2"
@@ -5400,14 +5408,6 @@ name = "xml-rs"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "xtask"
-version = "0.1.0"
-dependencies = [
- "structopt 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "yamux"
 version = "0.2.1"
diff --git a/Cargo.toml b/Cargo.toml
index 42ef99a2b374e..8d95ab8cf348d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,7 +80,7 @@ members = [
     "testsuite/libra-fuzzer",
     "types",
     "vm-validator",
-    "xtask",
+    "x",
 ]
 
 # NOTE: These members should never include crates that require fuzzing
diff --git a/documentation/coding_guidelines.md b/documentation/coding_guidelines.md
index d2191af44a082..3916b3e460fb9 100644
--- a/documentation/coding_guidelines.md
+++ b/documentation/coding_guidelines.md
@@ -317,7 +317,7 @@ As a consequence, it is recommended that you set up your test-only code in the f
     default = []
     testing = ["foo_crate/testing"]
     ```
-5. Update `xtask/src/test_unit.rs` to run the unit tests passing in the
+5. Update `x/src/test_unit.rs` to run the unit tests passing in the
    features if needed.
 
 *A final note on integration tests*: All tests that use conditional test-only
diff --git a/xtask/Cargo.toml b/x/Cargo.toml
similarity index 94%
rename from xtask/Cargo.toml
rename to x/Cargo.toml
index 38ada63e64619..0f2951bcded69 100644
--- a/xtask/Cargo.toml
+++ b/x/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "xtask"
+name = "x"
 version = "0.1.0"
 authors = ["Libra Association <opensource@libra.org>"]
 description = "Libra extended cargo tasks"
diff --git a/xtask/src/main.rs b/x/src/main.rs
similarity index 100%
rename from xtask/src/main.rs
rename to x/src/main.rs
diff --git a/xtask/src/test_unit.rs b/x/src/test_unit.rs
similarity index 100%
rename from xtask/src/test_unit.rs
rename to x/src/test_unit.rs