Reviewer changes

diff --git a/.gitmodules b/.gitmodules
index 329fdd5d1e4238250f03f7acc30659d40532e860..d5ae25646547f8be4ec143c30e2ba3ba305c043d 100644 (file)
--- 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
index e53b5c02c972f85f2da225955565fafa65aac073..ea7a921913717b2bab1d70d628fa28d2f3338ac7 100644 (file)
--- 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
index 67495b891f80d9bdf31c4332cc3e9bd3746014f7..72be9c12e84e6b0952db05e09b487c76427f405e 100644 (file)
--- 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 \