Update Makefile.toml

Author: topecongiro

.cargo/Makefile.toml

@@ -38,13 +38,6 @@ cargo-fmt = [
    "structopt",
 ]
 
-rustfmt-format-diff = [
-  "env_logger",
-  "serde",
-  "serde_json",
-  "structopt",
-]
-
 config = [
   "dirs",
   "rustfmt-config_proc_macro",
@@ -61,7 +54,20 @@ emitter = [
   "term",
 ]
 
+git-rustfmt = [
+  "env_logger",
+  "structopt",
+]
+
 rustfmt = [
+  "env_logger",
+  "structopt",
+]
+
+rustfmt-format-diff = [
+  "env_logger",
+  "serde",
+  "serde_json",
   "structopt",
 ]
 

Cargo.toml

@@ -1,4 +1,25 @@
-extend = ".cargo/Makefile.toml"
+[env]
+CFG_RELEASE = { value = "${CARGO_MAKE_RUST_VERSION}", condition = { env_not_set = ["CFG_RELEASE"] } }
+CFG_RELEASE_CHANNEL = { value = "${CARGO_MAKE_RUST_CHANNEL}", condition = { env_not_set = ["CFG_RELEASE_CHANNEL"] } }
+
+[tasks.build-bin]
+command = "cargo"
+args = [
+  "build",
+  "--bin",
+  "rustfmt",
+  "--bin",
+  "cargo-fmt",
+  "--features=rustfmt,cargo-fmt",
+]
+
+[tasks.build-bins]
+command = "cargo"
+args = [
+  "build",
+  "--all-features",
+  "--bins",
+]
 
 [tasks.install]
 command = "cargo"
@@ -7,7 +28,8 @@ args = [
   "--path",
   ".",
   "--force",
-  "--locked",
+  "--locked", # Respect Cargo.lock
+  "--features=rustfmt,cargo-fmt" # Install only rustfmt and cargo-fmt
 ]
 
 [tasks.test-all]
@@ -17,6 +39,23 @@ run_task = { name = ["test", "test-ignored"] }
 command = "cargo"
 args = [
   "test",
+	"--all-features",
 	"--",
 	"--ignored",
 ]
+
+[tasks.b]
+alias = "build"
+
+[tasks.bb]
+alias = "build-bin"
+
+[tasks.bins]
+alias = "build-bins"
+
+[tasks.c]
+alias = "check"
+
+[tasks.t]
+alias = "test"
+