From 39301ae5f21b6d6c8155d3b46ec6bf21f92de864 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Fri, 2 Mar 2018 14:28:34 +1300
Subject: [PATCH] Go back to a non-workspace structure

Kinda reverts https://github.com/rust-lang-nursery/rustfmt/pull/2419
---
 Cargo.lock                                    | 147 +-----------------
 Cargo.toml                                    |  71 +++++++--
 {rustfmt-core/src => src}/attr.rs             |   0
 {rustfmt-bin/src => src/bin}/main.rs          |   7 +-
 {cargo-fmt/src => src/cargo-fmt}/main.rs      |   0
 {rustfmt-core/src => src}/chains.rs           |   0
 {rustfmt-core/src => src}/checkstyle.rs       |   0
 {rustfmt-core/src => src}/closures.rs         |   0
 {rustfmt-core/src => src}/codemap.rs          |   0
 {rustfmt-core/src => src}/comment.rs          |   0
 .../src => src/config}/config_type.rs         |   8 +-
 .../src => src/config}/file_lines.rs          |   0
 {rustfmt-config/src => src/config}/lists.rs   |   4 +-
 .../src/lib.rs => src/config/mod.rs           |  17 +-
 {rustfmt-config/src => src/config}/options.rs |   4 +-
 {rustfmt-config/src => src/config}/summary.rs |   0
 {rustfmt-core/src => src}/expr.rs             |   0
 {rustfmt-core/src => src}/filemap.rs          |   0
 .../src => src/format-diff}/main.rs           |   0
 .../src => src/format-diff}/test/bindgen.diff |   0
 {git-rustfmt/src => src/git-rustfmt}/main.rs  |   5 +-
 {rustfmt-core/src => src}/imports.rs          |   0
 {rustfmt-core/src => src}/issues.rs           |   0
 {rustfmt-core/src => src}/items.rs            |   0
 {rustfmt-core/src => src}/lib.rs              |  10 +-
 {rustfmt-core/src => src}/lists.rs            |   0
 {rustfmt-core/src => src}/macros.rs           |   0
 {rustfmt-core/src => src}/missed_spans.rs     |   0
 {rustfmt-core/src => src}/modules.rs          |   0
 {rustfmt-core/src => src}/patterns.rs         |   0
 {rustfmt-core/src => src}/reorder.rs          |   0
 {rustfmt-core/src => src}/rewrite.rs          |   0
 {rustfmt-core/src => src}/rustfmt_diff.rs     |   0
 {rustfmt-core/src => src}/shape.rs            |   0
 {rustfmt-core/src => src}/spanned.rs          |   0
 {rustfmt-core/src => src}/string.rs           |   0
 {rustfmt-core/src => src}/types.rs            |   0
 {rustfmt-core/src => src}/utils.rs            |   0
 {rustfmt-core/src => src}/vertical.rs         |   0
 {rustfmt-core/src => src}/visitor.rs          |   0
 40 files changed, 96 insertions(+), 177 deletions(-)
 rename {rustfmt-core/src => src}/attr.rs (100%)
 rename {rustfmt-bin/src => src/bin}/main.rs (98%)
 rename {cargo-fmt/src => src/cargo-fmt}/main.rs (100%)
 rename {rustfmt-core/src => src}/chains.rs (100%)
 rename {rustfmt-core/src => src}/checkstyle.rs (100%)
 rename {rustfmt-core/src => src}/closures.rs (100%)
 rename {rustfmt-core/src => src}/codemap.rs (100%)
 rename {rustfmt-core/src => src}/comment.rs (100%)
 rename {rustfmt-config/src => src/config}/config_type.rs (98%)
 rename {rustfmt-config/src => src/config}/file_lines.rs (100%)
 rename {rustfmt-config/src => src/config}/lists.rs (97%)
 rename rustfmt-config/src/lib.rs => src/config/mod.rs (97%)
 rename {rustfmt-config/src => src/config}/options.rs (99%)
 rename {rustfmt-config/src => src/config}/summary.rs (100%)
 rename {rustfmt-core/src => src}/expr.rs (100%)
 rename {rustfmt-core/src => src}/filemap.rs (100%)
 rename {rustfmt-format-diff/src => src/format-diff}/main.rs (100%)
 rename {rustfmt-format-diff/src => src/format-diff}/test/bindgen.diff (100%)
 rename {git-rustfmt/src => src/git-rustfmt}/main.rs (98%)
 rename {rustfmt-core/src => src}/imports.rs (100%)
 rename {rustfmt-core/src => src}/issues.rs (100%)
 rename {rustfmt-core/src => src}/items.rs (100%)
 rename {rustfmt-core/src => src}/lib.rs (99%)
 rename {rustfmt-core/src => src}/lists.rs (100%)
 rename {rustfmt-core/src => src}/macros.rs (100%)
 rename {rustfmt-core/src => src}/missed_spans.rs (100%)
 rename {rustfmt-core/src => src}/modules.rs (100%)
 rename {rustfmt-core/src => src}/patterns.rs (100%)
 rename {rustfmt-core/src => src}/reorder.rs (100%)
 rename {rustfmt-core/src => src}/rewrite.rs (100%)
 rename {rustfmt-core/src => src}/rustfmt_diff.rs (100%)
 rename {rustfmt-core/src => src}/shape.rs (100%)
 rename {rustfmt-core/src => src}/spanned.rs (100%)
 rename {rustfmt-core/src => src}/string.rs (100%)
 rename {rustfmt-core/src => src}/types.rs (100%)
 rename {rustfmt-core/src => src}/utils.rs (100%)
 rename {rustfmt-core/src => src}/vertical.rs (100%)
 rename {rustfmt-core/src => src}/visitor.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 48768228d19..70f4ac551da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,16 +6,6 @@ dependencies = [
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.5"
@@ -42,15 +32,6 @@ name = "bitflags"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "cargo-fmt"
-version = "0.4.0"
-dependencies = [
- "cargo_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cargo_metadata"
 version = "0.4.1"
@@ -101,18 +82,6 @@ dependencies = [
  "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.11.0"
@@ -140,25 +109,6 @@ name = "getopts"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "git-rustfmt"
-version = "0.4.0"
-dependencies = [
- "env_logger 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfmt-config 0.4.0",
- "rustfmt-core 0.4.0",
-]
-
-[[package]]
-name = "humantime"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "itoa"
 version = "0.3.4"
@@ -240,11 +190,6 @@ dependencies = [
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "quick-error"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "quote"
 version = "0.3.15"
@@ -260,19 +205,6 @@ dependencies = [
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "regex"
 version = "0.2.6"
@@ -362,32 +294,14 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "rustfmt-bin"
-version = "0.4.0"
-dependencies = [
- "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfmt-config 0.4.0",
- "rustfmt-core 0.4.0",
-]
-
-[[package]]
-name = "rustfmt-config"
-version = "0.4.0"
-dependencies = [
- "rustc-ap-syntax 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustfmt-core"
+name = "rustfmt-nightly"
 version = "0.4.0"
 dependencies = [
+ "cargo_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive-new 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -395,23 +309,13 @@ dependencies = [
  "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-ap-rustc_errors 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-ap-syntax 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfmt-config 0.4.0",
- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustfmt-format-diff"
-version = "0.4.0"
-dependencies = [
- "env_logger 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -500,24 +404,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "termcolor"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termion"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "thread_local"
 version = "0.3.5"
@@ -597,17 +483,8 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "wincolor"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [metadata]
 "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
-"checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
 "checksum backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2"
 "checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661"
 "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
@@ -618,12 +495,10 @@ dependencies = [
 "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
-"checksum env_logger 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f3cc21490995c841d68e00276eba02071ebb269ec24011d5728bd00eabd39e31"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
-"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
 "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
@@ -635,11 +510,8 @@ dependencies = [
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
 "checksum parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd9d732f2de194336fb02fe11f9eed13d9e76f13f4315b4d88a14ca411750cd"
 "checksum parking_lot_core 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "538ef00b7317875071d5e00f603f24d16f0b474c1a5fc0ccb8b454ca72eafa79"
-"checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
-"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum rustc-ap-rustc_cratesio_shim 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ad5e562044ea78a6764dd75ae8afe4b21fde49f4548024b5fdf6345c21fb524"
@@ -660,8 +532,6 @@ dependencies = [
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
-"checksum termcolor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "56c456352e44f9f91f774ddeeed27c1ec60a2455ed66d692059acfb1d731bda1"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
 "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
 "checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
@@ -675,4 +545,3 @@ dependencies = [
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
diff --git a/Cargo.toml b/Cargo.toml
index 63d3c534221..0d796533dc7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,62 @@
-[workspace]
-members = [
-    "cargo-fmt",
-    "git-rustfmt",
-    "rustfmt-bin",
-    "rustfmt-config",
-    "rustfmt-core",
-    "rustfmt-format-diff",
-]
+[package]
+
+name = "rustfmt-nightly"
+version = "0.4.0"
+authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
+description = "Tool to find and fix Rust formatting issues"
+repository = "https://github.com/rust-lang-nursery/rustfmt"
+readme = "README.md"
+license = "Apache-2.0/MIT"
+build = "build.rs"
+categories = ["development-tools"]
+
+[lib]
+doctest = false
+
+[[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 = []
+
+[dependencies]
+toml = "0.4"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+unicode-segmentation = "1.0.0"
+regex = "0.2"
+term = "0.4"
+diff = "0.1"
+log = "0.3"
+env_logger = "0.4"
+getopts = "0.2"
+derive-new = "0.5"
+cargo_metadata = "0.4"
+rustc-ap-syntax = "29.0.0"
+rustc-ap-rustc_errors = "29.0.0"
+
+[dev-dependencies]
+lazy_static = "1.0.0"
+
+[target.'cfg(unix)'.dependencies]
+libc = "0.2.11"
+
+[target.'cfg(windows)'.dependencies]
+kernel32-sys = "0.2.2"
+winapi = "0.2.7"
diff --git a/rustfmt-core/src/attr.rs b/src/attr.rs
similarity index 100%
rename from rustfmt-core/src/attr.rs
rename to src/attr.rs
diff --git a/rustfmt-bin/src/main.rs b/src/bin/main.rs
similarity index 98%
rename from rustfmt-bin/src/main.rs
rename to src/bin/main.rs
index a058887a696..d58cb50ac68 100644
--- a/rustfmt-bin/src/main.rs
+++ b/src/bin/main.rs
@@ -12,8 +12,7 @@
 
 extern crate env_logger;
 extern crate getopts;
-extern crate rustfmt_config as config;
-extern crate rustfmt_core as rustfmt;
+extern crate rustfmt_nightly as rustfmt;
 
 use std::{env, error};
 use std::fs::File;
@@ -22,8 +21,8 @@ use std::path::{Path, PathBuf};
 
 use getopts::{Matches, Options};
 
-use config::{get_toml_path, Color, Config, WriteMode};
-use config::file_lines::FileLines;
+use rustfmt::config::{get_toml_path, Color, Config, WriteMode};
+use rustfmt::config::file_lines::FileLines;
 use rustfmt::{run, FileName, Input, Summary};
 
 use std::str::FromStr;
diff --git a/cargo-fmt/src/main.rs b/src/cargo-fmt/main.rs
similarity index 100%
rename from cargo-fmt/src/main.rs
rename to src/cargo-fmt/main.rs
diff --git a/rustfmt-core/src/chains.rs b/src/chains.rs
similarity index 100%
rename from rustfmt-core/src/chains.rs
rename to src/chains.rs
diff --git a/rustfmt-core/src/checkstyle.rs b/src/checkstyle.rs
similarity index 100%
rename from rustfmt-core/src/checkstyle.rs
rename to src/checkstyle.rs
diff --git a/rustfmt-core/src/closures.rs b/src/closures.rs
similarity index 100%
rename from rustfmt-core/src/closures.rs
rename to src/closures.rs
diff --git a/rustfmt-core/src/codemap.rs b/src/codemap.rs
similarity index 100%
rename from rustfmt-core/src/codemap.rs
rename to src/codemap.rs
diff --git a/rustfmt-core/src/comment.rs b/src/comment.rs
similarity index 100%
rename from rustfmt-core/src/comment.rs
rename to src/comment.rs
diff --git a/rustfmt-config/src/config_type.rs b/src/config/config_type.rs
similarity index 98%
rename from rustfmt-config/src/config_type.rs
rename to src/config/config_type.rs
index bace9dba8ff..950225679a5 100644
--- a/rustfmt-config/src/config_type.rs
+++ b/src/config/config_type.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use file_lines::FileLines;
-use options::WidthHeuristics;
+use config::file_lines::FileLines;
+use config::options::WidthHeuristics;
 
 /// Trait for types that can be used in `Config`.
 pub trait ConfigType: Sized {
@@ -102,7 +102,7 @@ macro_rules! create_config {
                 cloned.verbose = None;
                 cloned.width_heuristics = None;
 
-                toml::to_string(&cloned)
+                ::toml::to_string(&cloned)
                     .map_err(|e| format!("Could not output config: {}", e.to_string()))
             }
         }
@@ -211,7 +211,7 @@ macro_rules! create_config {
             }
 
             pub fn from_toml(toml: &str) -> Result<Config, String> {
-                let parsed: toml::Value =
+                let parsed: ::toml::Value =
                     toml.parse().map_err(|e| format!("Could not parse TOML: {}", e))?;
                 let mut err: String = String::new();
                 {
diff --git a/rustfmt-config/src/file_lines.rs b/src/config/file_lines.rs
similarity index 100%
rename from rustfmt-config/src/file_lines.rs
rename to src/config/file_lines.rs
diff --git a/rustfmt-config/src/lists.rs b/src/config/lists.rs
similarity index 97%
rename from rustfmt-config/src/lists.rs
rename to src/config/lists.rs
index 2ddc2e59261..53cf7ca7083 100644
--- a/rustfmt-config/src/lists.rs
+++ b/src/config/lists.rs
@@ -10,8 +10,8 @@
 
 //! Configuration options related to rewriting a list.
 
-use IndentStyle;
-use config_type::ConfigType;
+use config::IndentStyle;
+use config::config_type::ConfigType;
 
 /// The definitive formatting tactic for lists.
 #[derive(Eq, PartialEq, Debug, Copy, Clone)]
diff --git a/rustfmt-config/src/lib.rs b/src/config/mod.rs
similarity index 97%
rename from rustfmt-config/src/lib.rs
rename to src/config/mod.rs
index 0436cf2aae4..7e9fae81318 100644
--- a/rustfmt-config/src/lib.rs
+++ b/src/config/mod.rs
@@ -8,13 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate syntax;
-extern crate toml;
-
 use std::{env, fs};
 use std::cell::Cell;
 use std::default::Default;
@@ -31,11 +24,11 @@ pub mod file_lines;
 pub mod lists;
 pub mod summary;
 
-use config_type::ConfigType;
-use file_lines::FileLines;
-pub use lists::*;
-pub use options::*;
-use summary::Summary;
+use config::config_type::ConfigType;
+use config::file_lines::FileLines;
+pub use config::lists::*;
+pub use config::options::*;
+use config::summary::Summary;
 
 /// This macro defines configuration options used in rustfmt. Each option
 /// is defined as follows:
diff --git a/rustfmt-config/src/options.rs b/src/config/options.rs
similarity index 99%
rename from rustfmt-config/src/options.rs
rename to src/config/options.rs
index 6aa3db4f3df..dcea4706ace 100644
--- a/rustfmt-config/src/options.rs
+++ b/src/config/options.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use config_type::ConfigType;
-use lists::*;
+use config::config_type::ConfigType;
+use config::lists::*;
 
 /// Macro for deriving implementations of Serialize/Deserialize for enums
 #[macro_export]
diff --git a/rustfmt-config/src/summary.rs b/src/config/summary.rs
similarity index 100%
rename from rustfmt-config/src/summary.rs
rename to src/config/summary.rs
diff --git a/rustfmt-core/src/expr.rs b/src/expr.rs
similarity index 100%
rename from rustfmt-core/src/expr.rs
rename to src/expr.rs
diff --git a/rustfmt-core/src/filemap.rs b/src/filemap.rs
similarity index 100%
rename from rustfmt-core/src/filemap.rs
rename to src/filemap.rs
diff --git a/rustfmt-format-diff/src/main.rs b/src/format-diff/main.rs
similarity index 100%
rename from rustfmt-format-diff/src/main.rs
rename to src/format-diff/main.rs
diff --git a/rustfmt-format-diff/src/test/bindgen.diff b/src/format-diff/test/bindgen.diff
similarity index 100%
rename from rustfmt-format-diff/src/test/bindgen.diff
rename to src/format-diff/test/bindgen.diff
diff --git a/git-rustfmt/src/main.rs b/src/git-rustfmt/main.rs
similarity index 98%
rename from git-rustfmt/src/main.rs
rename to src/git-rustfmt/main.rs
index 558efbf0c0f..8811c1a5255 100644
--- a/git-rustfmt/src/main.rs
+++ b/src/git-rustfmt/main.rs
@@ -12,8 +12,7 @@ extern crate env_logger;
 extern crate getopts;
 #[macro_use]
 extern crate log;
-extern crate rustfmt_config as config;
-extern crate rustfmt_core as rustfmt;
+extern crate rustfmt_nightly as rustfmt;
 
 use std::env;
 use std::path::{Path, PathBuf};
@@ -22,7 +21,7 @@ use std::str::FromStr;
 
 use getopts::{Matches, Options};
 
-use rustfmt::{run, Input};
+use rustfmt::{config, run, Input};
 
 fn prune_files(files: Vec<&str>) -> Vec<&str> {
     let prefixes: Vec<_> = files
diff --git a/rustfmt-core/src/imports.rs b/src/imports.rs
similarity index 100%
rename from rustfmt-core/src/imports.rs
rename to src/imports.rs
diff --git a/rustfmt-core/src/issues.rs b/src/issues.rs
similarity index 100%
rename from rustfmt-core/src/issues.rs
rename to src/issues.rs
diff --git a/rustfmt-core/src/items.rs b/src/items.rs
similarity index 100%
rename from rustfmt-core/src/items.rs
rename to src/items.rs
diff --git a/rustfmt-core/src/lib.rs b/src/lib.rs
similarity index 99%
rename from rustfmt-core/src/lib.rs
rename to src/lib.rs
index 6e9554f6855..7ef4931fbe3 100644
--- a/rustfmt-core/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015-2018 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+
 #![feature(custom_attribute)]
 #![feature(decl_macro)]
 #![feature(match_default_bindings)]
@@ -20,9 +21,13 @@ extern crate diff;
 extern crate log;
 extern crate regex;
 extern crate rustc_errors as errors;
-extern crate rustfmt_config as config;
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde_json;
 extern crate syntax;
 extern crate term;
+extern crate toml;
 extern crate unicode_segmentation;
 
 use std::collections::HashMap;
@@ -59,6 +64,7 @@ mod checkstyle;
 mod closures;
 pub mod codemap;
 mod comment;
+pub mod config;
 mod expr;
 pub mod filemap;
 mod imports;
diff --git a/rustfmt-core/src/lists.rs b/src/lists.rs
similarity index 100%
rename from rustfmt-core/src/lists.rs
rename to src/lists.rs
diff --git a/rustfmt-core/src/macros.rs b/src/macros.rs
similarity index 100%
rename from rustfmt-core/src/macros.rs
rename to src/macros.rs
diff --git a/rustfmt-core/src/missed_spans.rs b/src/missed_spans.rs
similarity index 100%
rename from rustfmt-core/src/missed_spans.rs
rename to src/missed_spans.rs
diff --git a/rustfmt-core/src/modules.rs b/src/modules.rs
similarity index 100%
rename from rustfmt-core/src/modules.rs
rename to src/modules.rs
diff --git a/rustfmt-core/src/patterns.rs b/src/patterns.rs
similarity index 100%
rename from rustfmt-core/src/patterns.rs
rename to src/patterns.rs
diff --git a/rustfmt-core/src/reorder.rs b/src/reorder.rs
similarity index 100%
rename from rustfmt-core/src/reorder.rs
rename to src/reorder.rs
diff --git a/rustfmt-core/src/rewrite.rs b/src/rewrite.rs
similarity index 100%
rename from rustfmt-core/src/rewrite.rs
rename to src/rewrite.rs
diff --git a/rustfmt-core/src/rustfmt_diff.rs b/src/rustfmt_diff.rs
similarity index 100%
rename from rustfmt-core/src/rustfmt_diff.rs
rename to src/rustfmt_diff.rs
diff --git a/rustfmt-core/src/shape.rs b/src/shape.rs
similarity index 100%
rename from rustfmt-core/src/shape.rs
rename to src/shape.rs
diff --git a/rustfmt-core/src/spanned.rs b/src/spanned.rs
similarity index 100%
rename from rustfmt-core/src/spanned.rs
rename to src/spanned.rs
diff --git a/rustfmt-core/src/string.rs b/src/string.rs
similarity index 100%
rename from rustfmt-core/src/string.rs
rename to src/string.rs
diff --git a/rustfmt-core/src/types.rs b/src/types.rs
similarity index 100%
rename from rustfmt-core/src/types.rs
rename to src/types.rs
diff --git a/rustfmt-core/src/utils.rs b/src/utils.rs
similarity index 100%
rename from rustfmt-core/src/utils.rs
rename to src/utils.rs
diff --git a/rustfmt-core/src/vertical.rs b/src/vertical.rs
similarity index 100%
rename from rustfmt-core/src/vertical.rs
rename to src/vertical.rs
diff --git a/rustfmt-core/src/visitor.rs b/src/visitor.rs
similarity index 100%
rename from rustfmt-core/src/visitor.rs
rename to src/visitor.rs