Move rustfmt binariy crates to workspace

Author: topecongiro

Cargo.toml

@@ -7,25 +7,25 @@ description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"
 readme = "README.md"
 license = "Apache-2.0/MIT"
-build = "build.rs"
+build = "rustfmt-core/rustfmt-bin/build.rs"
 categories = ["development-tools"]
 edition = "2018"
 
 [[bin]]
 name = "rustfmt"
-path = "src/bin/main.rs"
+path = "rustfmt-core/rustfmt-bin/src/bin/main.rs"
 
 [[bin]]
 name = "cargo-fmt"
-path = "src/cargo-fmt/main.rs"
+path = "rustfmt-core/rustfmt-bin/src/cargo-fmt/main.rs"
 
 [[bin]]
 name = "rustfmt-format-diff"
-path = "src/format-diff/main.rs"
+path = "rustfmt-core/rustfmt-bin/src/format-diff/main.rs"
 
 [[bin]]
 name = "git-rustfmt"
-path = "src/git-rustfmt/main.rs"
+path = "rustfmt-core/rustfmt-bin/src/git-rustfmt/main.rs"
 
 [features]
 default = ["cargo-fmt", "rustfmt-format-diff"]

rustfmt-core/Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "rustfmt-bin",
   "rustfmt-config",
   "rustfmt-emitter",
   "rustfmt-lib",

rustfmt-core/rustfmt-bin/Cargo.toml

@@ -0,0 +1,52 @@
+[package]
+
+# The metadata of this crate is intentionally removed to avoid publishing this crate by accident.
+name = "rustfmt-bin"
+version = "2.0.0-rc.1"
+edition = "2018"
+
+[[bin]]
+name = "rustfmt"
+path = "src/bin/main.rs"
+
+[[bin]]
+name = "cargo-fmt"
+path = "src/cargo-fmt/main.rs"
+
+[[bin]]
+name = "rustfmt-format-diff"
+path = "src/format-diff/main.rs"
+
+[[bin]]
+name = "git-rustfmt"
+path = "src/git-rustfmt/main.rs"
+
+[features]
+default = ["cargo-fmt", "rustfmt-format-diff"]
+cargo-fmt = []
+rustfmt-format-diff = []
+generic-simd = ["rustfmt_lib/generic-simd"]
+
+[dependencies]
+ansi_term = "0.12"
+anyhow = "1.0"
+cargo_metadata = "0.9"
+env_logger = "0.7"
+getopts = "0.2"
+log = "0.4"
+regex = "1.0"
+serde = "1.0"
+serde_json = "1.0"
+structopt = "0.3"
+term = "0.6"
+thiserror = "1.0"
+
+rustfmt_lib = { path = "../rustfmt-lib", version = "1.0" }
+
+[dev-dependencies]
+lazy_static = "1.0"
+
+# A noop dependency that changes in the Rust repository, it's a bit of a hack.
+# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
+# for more information.
+rustc-workspace-hack = "1.0.0"

build.rs renamed to rustfmt-core/rustfmt-bin/build.rs

@@ -4,3 +4,5 @@ version = "0.1.0"
 authors = ["rustfmt devs <[email protected]>"]
 
 [dependencies]
+
+[workspace]

src/bin/main.rs renamed to rustfmt-core/rustfmt-bin/src/bin/main.rs

@@ -4,3 +4,5 @@ version = "0.1.0"
 authors = ["rustfmt devs <[email protected]>"]
 
 [dependencies]
+
+[workspace]

src/cargo-fmt/main.rs renamed to rustfmt-core/rustfmt-bin/src/cargo-fmt/main.rs

@@ -4,3 +4,5 @@ version = "0.1.0"
 authors = ["rustfmt devs <[email protected]>"]
 
 [dependencies]
+
+[workspace]

src/format-diff/main.rs renamed to rustfmt-core/rustfmt-bin/src/format-diff/main.rs

@@ -5,3 +5,5 @@ authors = ["rustfmt devs <[email protected]>"]
 edition = "2018"
 
 [dependencies]
+
+[workspace]