Reviewer changes

TimNN · Sep 13, 2017 · 368cab3 · 368cab3
1 parent d0070e8
commit 368cab3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitmodules b/.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
diff --git a/src/Cargo.toml b/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" }
diff --git a/src/bootstrap/mk/Makefile.in b/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 \