Rollup merge of #44533 - nrc:rustfmt-submod, r=alexcrichton

Add Rustfmt

r? @alexcrichton

diff --cc src/Cargo.lock
index 3e09b6fefd0b136f8adfbca1d9fc20b5ba8737a3,8a87a4eb7da1d1fb0b03bc415e453292500779a1..44faf4b445de16ff71ee242b391172d454b0ee84
--- 1/src/Cargo.lock
--- 2/src/Cargo.lock
+++ b/src/Cargo.lock
@@@ -1346,12 -1334,12 +1346,12 @@@ dependencies = 
   "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rls-analysis 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rls-analysis 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rls-rustc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustfmt-nightly 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustfmt-nightly 0.2.5",
   "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
   "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
   "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

diff --cc src/Cargo.toml
index 98eb26c77532f958448e3bfa428615ba683aa03b,ea7a921913717b2bab1d70d628fa28d2f3338ac7..8142213b20421b7dfba670268ead87ea88638ef9
--- 1/src/Cargo.toml
--- 2/src/Cargo.toml
+++ b/src/Cargo.toml
@@@ -56,5 -57,13 +57,13 @@@ debug-assertions = fals
  debug = false
  debug-assertions = false
  
 -[patch.'https://github.com/rust-lang/cargo']
 +[patch."https://github.com/rust-lang/cargo"]
  cargo = { path = "tools/cargo" }
+ 
+ # Override rustfmt dependencies both on the repo and the crate (the RLS
+ # sometimes uses either).
+ # FIXME should only need the crates.io patch, long term.
+ [patch.'https://github.com/rust-lang-nursery/rustfmt']
+ rustfmt-nightly = { path = "tools/rustfmt" }
+ [patch.crates-io]
+ rustfmt-nightly = { path = "tools/rustfmt" }

diff --cc src/bootstrap/check.rs
Simple merge

diff --cc src/bootstrap/tool.rs
Simple merge