From 368cab3b0357194f407060cd1a1d3339cf854c25 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Wed, 13 Sep 2017 16:43:56 +1200 Subject: [PATCH] Reviewer changes --- .gitmodules | 2 +- src/Cargo.toml | 4 +++- src/bootstrap/mk/Makefile.in | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 329fdd5d1e4..d5ae2564654 100644 --- 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 e53b5c02c97..ea7a9219137 100644 --- 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 67495b891f8..72be9c12e84 100644 --- 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 \ -- 2.44.0