nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reviewer changes

Browse Source
This commit is contained in:
Nick Cameron 2017-09-13 16:43:56 +12:00
parent d0070e85db
commit 368cab3b03
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -38,4 +38,4 @@
url = https://github.com/rust-lang-nursery/rust-clippy.git url = https://github.com/rust-lang-nursery/rust-clippy.git
[submodule "src/tools/rustfmt"] [submodule "src/tools/rustfmt"]
path = 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

4
src/Cargo.toml
View File

@ -60,8 +60,10 @@ debug-assertions = false
[patch.'https://github.com/rust-lang/cargo'] [patch.'https://github.com/rust-lang/cargo']
cargo = { path = "tools/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'] [patch.'https://github.com/rust-lang-nursery/rustfmt']
rustfmt-nightly = { path = "tools/rustfmt" } rustfmt-nightly = { path = "tools/rustfmt" }
[patch.crates-io] [patch.crates-io]
rustfmt-nightly = { path = "tools/rustfmt" } rustfmt-nightly = { path = "tools/rustfmt" }

1
src/bootstrap/mk/Makefile.in
View File

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