diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-09-13 16:43:56 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2017-09-13 16:48:53 +1200 |
| commit | 368cab3b0357194f407060cd1a1d3339cf854c25 (patch) | |
| tree | 259e7f955615028eb1828c954b5f983703e00490 /src | |
| parent | d0070e85db2bd2ee4f40f1ce7571e011d00ee1fa (diff) | |
| download | rust-368cab3b0357194f407060cd1a1d3339cf854c25.tar.gz rust-368cab3b0357194f407060cd1a1d3339cf854c25.zip | |
Reviewer changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cargo.toml | 4 | ||||
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 1 |
2 files changed, 4 insertions, 1 deletions
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 \ |