Reviewer changes

.gitmodules

@@ -38,4 +38,4 @@
 	url = https://github.com/rust-lang-nursery/rust-clippy.git
 [submodule "src/tools/rustfmt"]
 	path = src/tools/rustfmt
-	url = git@github.com:rust-lang-nursery/rustfmt.git
+	url = https://github.com/rust-lang-nursery/rustfmt.git

src/Cargo.toml

@@ -60,8 +60,10 @@ debug-assertions = false
 [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" }

src/bootstrap/mk/Makefile.in

@@ -55,6 +55,7 @@ check-aux:
 		src/tools/cargotest \
 		src/tools/cargo \
 		src/tools/rls \
+		src/tools/rustfmt \
 		src/test/pretty \
 		src/test/run-pass/pretty \
 		src/test/run-fail/pretty \