X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=CONTRIBUTING.md;h=04b6fea75a78a87d962e33aa961635832fd7a404;hb=d1ba747edc9fa8d2bcd78b37f5423265be69a76b;hp=0314a5dfd8d02a5b283d317ef83cadad445fd8ce;hpb=fc5ff66b04af18b42a5278f1f74875311c957555;p=rust.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0314a5dfd8d..04b6fea75a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -177,7 +177,7 @@ python x.py test src/test/rustdoc python x.py build src/libcore --stage 0 ``` -You can explore the build system throught the various `--help` pages for each +You can explore the build system through the various `--help` pages for each subcommand. For example to learn more about a command you can run: ``` @@ -232,6 +232,7 @@ Some common invocations of `x.py` are: guidelines as of yet, but basic rules like 4 spaces for indentation and no more than 99 characters in a single line should be kept in mind when writing code. +- `rustup toolchain link build//` - Use the custom compiler build via [rustup](https://github.com/rust-lang-nursery/rustup.rs#working-with-custom-toolchains-and-local-builds). ## Pull Requests @@ -288,7 +289,7 @@ been approved. The PR then enters the [merge queue][merge-queue], where @bors will run all the tests on every platform we support. If it all works out, @bors will merge your code into `master` and close the pull request. -[merge-queue]: https://buildbot.rust-lang.org/homu/queue/rust +[merge-queue]: https://buildbot2.rust-lang.org/homu/queue/rust Speaking of tests, Rust has a comprehensive test suite. More information about it can be found