blob: 65cdfe67b5b08a83dead3ea6b2da7ebd1a80df14 [file] [log] [blame] [view]
Steve Klabnikf645cad2015-02-13 17:26:441# Contributing to Rust
Garrett Bergdaf3ed52017-09-29 23:19:172[contributing-to-rust]: #contributing-to-rust
Tim Chevalier5afd7602013-10-21 19:10:573
Steve Klabnikf645cad2015-02-13 17:26:444Thank you for your interest in contributing to Rust! There are many ways to
5contribute, and we appreciate all of them. This document is a bit long, so here's
6links to the major sections:
Tim Chevalier5afd7602013-10-21 19:10:577
Steve Klabnikf645cad2015-02-13 17:26:448* [Feature Requests](#feature-requests)
9* [Bug Reports](#bug-reports)
Greg Chappledc6ed632016-01-25 14:07:1010* [The Build System](#the-build-system)
Steve Klabnikf645cad2015-02-13 17:26:4411* [Pull Requests](#pull-requests)
12* [Writing Documentation](#writing-documentation)
13* [Issue Triage](#issue-triage)
14* [Out-of-tree Contributions](#out-of-tree-contributions)
christopherdumas3f866022015-09-11 23:21:1115* [Helpful Links and Information](#helpful-links-and-information)
Tim Chevalier5afd7602013-10-21 19:10:5716
Steve Klabnikf645cad2015-02-13 17:26:4417If you have questions, please make a post on [internals.rust-lang.org][internals] or
18hop on [#rust-internals][pound-rust-internals].
Nick Cameron852cef82014-09-22 00:46:2419
Darrell Hamiltona6b47c02015-02-19 03:53:0020As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
Brian Anderson36c63a32015-01-02 23:41:4721
Suriyaa ✌️️2d108ec2017-10-03 10:36:1622[pound-rust-internals]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
Eli Friedmanbbbfed22015-08-09 21:15:0523[internals]: https://internals.rust-lang.org
24[coc]: https://www.rust-lang.org/conduct.html
Brian Anderson36c63a32015-01-02 23:41:4725
Steve Klabnikf645cad2015-02-13 17:26:4426## Feature Requests
Garrett Bergdaf3ed52017-09-29 23:19:1727[feature-requests]: #feature-requests
Steve Klabnikf645cad2015-02-13 17:26:4428
Kurtis Nusbaumf9c5b1f2018-03-03 19:12:0929To request a change to the way the Rust language works, please head over
30to the [RFCs repository](https://github.com/rust-lang/rfcs) and view the
31[README](https://github.com/rust-lang/rfcs/blob/master/README.md)
32for instructions.
Steve Klabnikf645cad2015-02-13 17:26:4433
34## Bug Reports
Garrett Bergdaf3ed52017-09-29 23:19:1735[bug-reports]: #bug-reports
Steve Klabnikf645cad2015-02-13 17:26:4436
37While bugs are unfortunate, they're a reality in software. We can't fix what we
38don't know about, so please report liberally. If you're not sure if something
39is a bug or not, feel free to file a bug anyway.
40
Brian Anderson0d0cb3b2015-11-06 22:05:1941**If you believe reporting your bug publicly represents a security risk to Rust users,
Jens Hausdorf38667102018-12-09 14:25:2342please follow our [instructions for reporting security vulnerabilities](https://www.rust-lang.org/policies/security)**.
Brian Anderson0d0cb3b2015-11-06 22:05:1943
Steve Klabnikf645cad2015-02-13 17:26:4444If you have the chance, before reporting a bug, please [search existing
45issues](https://github.com/rust-lang/rust/search?q=&type=Issues&utf8=%E2%9C%93),
46as it's possible that someone else has already reported your error. This doesn't
47always work, and sometimes it's hard to know what to search for, so consider this
48extra credit. We won't mind if you accidentally file a duplicate report.
49
Niv Kaminer79b11272018-04-21 09:08:0150Similarly, to help others who encountered the bug find your issue,
Lukas Bergdoll0bc8d4e2018-06-08 17:44:0451consider filing an issue with a descriptive title, which contains information that might be unique to it.
Niv Kaminer79b11272018-04-21 09:08:0152This can be the language or compiler feature used, the conditions that trigger the bug,
53or part of the error message if there is any.
54An example could be: **"impossible case reached" on lifetime inference for impl Trait in return position**.
55
Steve Klabnikf645cad2015-02-13 17:26:4456Opening an issue is as easy as following [this
57link](https://github.com/rust-lang/rust/issues/new) and filling out the fields.
58Here's a template that you can use to file a bug, though it's not necessary to
59use it exactly:
60
61 <short summary of the bug>
62
63 I tried this code:
64
65 <code sample that causes the bug>
66
67 I expected to see this happen: <explanation>
68
69 Instead, this happened: <explanation>
70
71 ## Meta
72
73 `rustc --version --verbose`:
74
75 Backtrace:
76
77All three components are important: what you did, what you expected, what
78happened instead. Please include the output of `rustc --version --verbose`,
79which includes important information about what platform you're on, what
80version of Rust you're using, etc.
81
82Sometimes, a backtrace is helpful, and so including that is nice. To get
Emanuel Cziraie1d2eda2016-03-28 12:41:5583a backtrace, set the `RUST_BACKTRACE` environment variable to a value
84other than `0`. The easiest way
Steve Klabnikf645cad2015-02-13 17:26:4485to do this is to invoke `rustc` like this:
86
87```bash
88$ RUST_BACKTRACE=1 rustc ...
89```
90
Greg Chappledc6ed632016-01-25 14:07:1091## The Build System
Garrett Bergdaf3ed52017-09-29 23:19:1792[the-build-system]: #the-build-system
Greg Chappledc6ed632016-01-25 14:07:1093
Greg Chapple05f7b592016-01-26 14:41:2994Rust's build system allows you to bootstrap the compiler, run tests &
95benchmarks, generate documentation, install a fresh build of Rust, and more.
96It's your best friend when working on Rust, allowing you to compile & test
97your contributions before submission.
Greg Chappledc6ed632016-01-25 14:07:1098
Alex Crichton0e272de2016-11-16 20:31:1999The build system lives in [the `src/bootstrap` directory][bootstrap] in the
100project root. Our build system is itself written in Rust and is based on Cargo
101to actually build all the compiler's crates. If you have questions on the build
102system internals, try asking in [`#rust-internals`][pound-rust-internals].
Greg Chappledc6ed632016-01-25 14:07:10103
Alex Crichton0e272de2016-11-16 20:31:19104[bootstrap]: https://github.com/rust-lang/rust/tree/master/src/bootstrap/
105
Greg Chappledc6ed632016-01-25 14:07:10106### Configuration
Garrett Bergdaf3ed52017-09-29 23:19:17107[configuration]: #configuration
Greg Chappledc6ed632016-01-25 14:07:10108
109Before you can start building the compiler you need to configure the build for
110your system. In most cases, that will just mean using the defaults provided
Josh Driverfb2d7632017-02-23 10:45:30111for Rust.
Greg Chappledc6ed632016-01-25 14:07:10112
Steven Fackler1126a852017-08-12 05:24:25113To change configuration, you must copy the file `config.toml.example`
Josh Driverfb2d7632017-02-23 10:45:30114to `config.toml` in the directory from which you will be running the build, and
115change the settings provided.
Greg Chappledc6ed632016-01-25 14:07:10116
Josh Driverfb2d7632017-02-23 10:45:30117There are large number of options provided in this config file that will alter the
118configuration used in the build process. Some options to note:
Greg Chappledc6ed632016-01-25 14:07:10119
Josh Driverfb2d7632017-02-23 10:45:30120#### `[llvm]`:
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32121- `assertions = true` = This enables LLVM assertions, which makes LLVM misuse cause an assertion failure instead of weird misbehavior. This also slows down the compiler's runtime by ~20%.
Josh Driverfb2d7632017-02-23 10:45:30122- `ccache = true` - Use ccache when building llvm
Greg Chappledc6ed632016-01-25 14:07:10123
Josh Driverfb2d7632017-02-23 10:45:30124#### `[build]`:
125- `compiler-docs = true` - Build compiler documentation
126
127#### `[rust]`:
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32128- `debuginfo = true` - Build a compiler with debuginfo. Makes building rustc slower, but then you can use a debugger to debug `rustc`.
129- `debuginfo-lines = true` - An alternative to `debuginfo = true` that doesn't let you use a debugger, but doesn't make building rustc slower and still gives you line numbers in backtraces.
Josh Stonecc2906c2018-04-13 23:52:54130- `debuginfo-tools = true` - Build the extended tools with debuginfo.
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32131- `debug-assertions = true` - Makes the log output of `debug!` work.
132- `optimize = false` - Disable optimizations to speed up compilation of stage1 rust, but makes the stage1 compiler x100 slower.
Josh Driverfb2d7632017-02-23 10:45:30133
134For more options, the `config.toml` file contains commented out defaults, with
135descriptions of what each option will do.
136
137Note: Previously the `./configure` script was used to configure this
138project. It can still be used, but it's recommended to use a `config.toml`
139file. If you still have a `config.mk` file in your directory - from
140`./configure` - you may need to delete it for `config.toml` to work.
Greg Chappledc6ed632016-01-25 14:07:10141
Alex Crichton0e272de2016-11-16 20:31:19142### Building
Garrett Bergdaf3ed52017-09-29 23:19:17143[building]: #building
144
ccesare3a76b872018-06-14 13:23:28145A default configuration requires around 3.5 GB of disk space, whereas building a debug configuration may require more than 30 GB.
Kerem670448d2018-04-18 17:06:05146
Garrett Bergdaf3ed52017-09-29 23:19:17147Dependencies
148- [build dependencies](README.md#building-from-source)
149- `gdb` 6.2.0 minimum, 7.1 or later recommended for test builds
Greg Chappledc6ed632016-01-25 14:07:10150
Josh Driverfb2d7632017-02-23 10:45:30151The build system uses the `x.py` script to control the build process. This script
152is used to build, test, and document various parts of the compiler. You can
153execute it as:
Greg Chappledc6ed632016-01-25 14:07:10154
Alex Crichton0e272de2016-11-16 20:31:19155```sh
156python x.py build
157```
158
159On some systems you can also use the shorter version:
160
161```sh
162./x.py build
163```
164
165To learn more about the driver and top-level targets, you can execute:
166
167```sh
168python x.py --help
169```
170
171The general format for the driver script is:
172
173```sh
174python x.py <command> [<directory>]
175```
176
177Some example commands are `build`, `test`, and `doc`. These will build, test,
178and document the specified directory. The second argument, `<directory>`, is
179optional and defaults to working over the entire compiler. If specified,
180however, only that specific directory will be built. For example:
181
182```sh
183# build the entire compiler
184python x.py build
185
186# build all documentation
187python x.py doc
188
189# run all test suites
190python x.py test
191
192# build only the standard library
193python x.py build src/libstd
194
195# test only one particular test suite
196python x.py test src/test/rustdoc
197
198# build only the stage0 libcore library
199python x.py build src/libcore --stage 0
200```
201
fasobf2e0c22017-05-16 07:56:07202You can explore the build system through the various `--help` pages for each
Alex Crichton0e272de2016-11-16 20:31:19203subcommand. For example to learn more about a command you can run:
204
205```
206python x.py build --help
207```
208
209To learn about all possible rules you can execute, run:
210
211```
212python x.py build --help --verbose
213```
214
Josh Driverfb2d7632017-02-23 10:45:30215Note: Previously `./configure` and `make` were used to build this project.
216They are still available, but `x.py` is the recommended build system.
217
Alex Crichton0e272de2016-11-16 20:31:19218### Useful commands
Garrett Bergdaf3ed52017-09-29 23:19:17219[useful-commands]: #useful-commands
Alex Crichton0e272de2016-11-16 20:31:19220
221Some common invocations of `x.py` are:
222
223- `x.py build --help` - show the help message and explain the subcommand
224- `x.py build src/libtest --stage 1` - build up to (and including) the first
225 stage. For most cases we don't need to build the stage2 compiler, so we can
226 save time by not building it. The stage1 compiler is a fully functioning
227 compiler and (probably) will be enough to determine if your change works as
228 expected.
229- `x.py build src/rustc --stage 1` - This will build just rustc, without libstd.
230 This is the fastest way to recompile after you changed only rustc source code.
231 Note however that the resulting rustc binary won't have a stdlib to link
232 against by default. You can build libstd once with `x.py build src/libstd`,
Glyne J. Gittensb3f61ce2017-02-19 22:30:50233 but it is only guaranteed to work if recompiled, so if there are any issues
Alex Crichton0e272de2016-11-16 20:31:19234 recompile it.
235- `x.py test` - build the full compiler & run all tests (takes a while). This
Greg Chappledc6ed632016-01-25 14:07:10236 is what gets run by the continuous integration system against your pull
237 request. You should run this before submitting to make sure your tests pass
238 & everything builds in the correct manner.
Alex Crichton0e272de2016-11-16 20:31:19239- `x.py test src/libstd --stage 1` - test the standard library without
240 recompiling stage 2.
Seo Sanghyeon8ed52ed2016-12-13 16:31:48241- `x.py test src/test/run-pass --test-args TESTNAME` - Run a matching set of
242 tests.
Florian Bergerccafdae2016-03-13 19:57:24243 - `TESTNAME` should be a substring of the tests to match against e.g. it could
244 be the fully qualified test name, or just a part of it.
Ryan Thomasa58d3302016-02-01 06:04:39245 `TESTNAME=collections::hash::map::test_map::test_capacity_not_less_than_len`
Ryan Thomasa5e491f2016-02-01 23:57:24246 or `TESTNAME=test_capacity_not_less_than_len`.
Seo Sanghyeon8ed52ed2016-12-13 16:31:48247- `x.py test src/test/run-pass --stage 1 --test-args <substring-of-test-name>` -
Alex Crichton0e272de2016-11-16 20:31:19248 Run a single rpass test with the stage1 compiler (this will be quicker than
249 running the command above as we only build the stage1 compiler, not the entire
250 thing). You can also leave off the directory argument to run all stage1 test
251 types.
252- `x.py test src/libcore --stage 1` - Run stage1 tests in `libcore`.
253- `x.py test src/tools/tidy` - Check that the source code is in compliance with
254 Rust's style guidelines. There is no official document describing Rust's full
255 guidelines as of yet, but basic rules like 4 spaces for indentation and no
256 more than 99 characters in a single line should be kept in mind when writing
257 code.
QuietMisdreavus1615d352017-08-30 22:06:12258
259### Using your local build
Garrett Bergdaf3ed52017-09-29 23:19:17260[using-local-build]: #using-local-build
QuietMisdreavus1615d352017-08-30 22:06:12261
262If you use Rustup to manage your rust install, it has a feature called ["custom
263toolchains"][toolchain-link] that you can use to access your newly-built compiler
264without having to install it to your system or user PATH. If you've run `python
265x.py build`, then you can add your custom rustc to a new toolchain like this:
266
267[toolchain-link]: https://github.com/rust-lang-nursery/rustup.rs#working-with-custom-toolchains-and-local-builds
268
269```
270rustup toolchain link <name> build/<host-triple>/stage2
271```
272
273Where `<host-triple>` is the build triple for the host (the triple of your
274computer, by default), and `<name>` is the name for your custom toolchain. (If you
275added `--stage 1` to your build command, the compiler will be in the `stage1`
276folder instead.) You'll only need to do this once - it will automatically point
277to the latest build you've done.
278
279Once this is set up, you can use your custom toolchain just like any other. For
280example, if you've named your toolchain `local`, running `cargo +local build` will
281compile a project with your custom rustc, setting `rustup override set local` will
282override the toolchain for your current directory, and `cargo +local doc` will use
283your custom rustc and rustdoc to generate docs. (If you do this with a `--stage 1`
284build, you'll need to build rustdoc specially, since it's not normally built in
285stage 1. `python x.py build --stage 1 src/libstd src/tools/rustdoc` will build
286rustdoc and libstd, which will allow rustdoc to be run with that toolchain.)
Greg Chappledc6ed632016-01-25 14:07:10287
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32288### Out-of-tree builds
289[out-of-tree-builds]: #out-of-tree-builds
290
291Rust's `x.py` script fully supports out-of-tree builds - it looks for
292the Rust source code from the directory `x.py` was found in, but it
293reads the `config.toml` configuration file from the directory it's
294run in, and places all build artifacts within a subdirectory named `build`.
295
296This means that if you want to do an out-of-tree build, you can just do it:
297```
298$ cd my/build/dir
299$ cp ~/my-config.toml config.toml # Or fill in config.toml otherwise
300$ path/to/rust/x.py build
301...
302$ # This will use the Rust source code in `path/to/rust`, but build
303$ # artifacts will now be in ./build
304```
305
306It's absolutely fine to have multiple build directories with different
307`config.toml` configurations using the same code.
308
Steve Klabnikf645cad2015-02-13 17:26:44309## Pull Requests
Garrett Bergdaf3ed52017-09-29 23:19:17310[pull-requests]: #pull-requests
Steve Klabnikf645cad2015-02-13 17:26:44311
312Pull requests are the primary mechanism we use to change Rust. GitHub itself
Matthew Walinga9a4287d2018-01-18 23:05:33313has some [great documentation][about-pull-requests] on using the Pull Request feature.
Tej Chajeda7461292017-08-12 11:28:29314We use the "fork and pull" model [described here][development-models], where
315contributors push changes to their personal fork and create pull requests to
316bring those changes into the source repository.
Steve Klabnikf645cad2015-02-13 17:26:44317
Matthew Walinga9a4287d2018-01-18 23:05:33318[about-pull-requests]: https://help.github.com/articles/about-pull-requests/
Tej Chajeda7461292017-08-12 11:28:29319[development-models]: https://help.github.com/articles/about-collaborative-development-models/
Steve Klabnikf645cad2015-02-13 17:26:44320
321Please make pull requests against the `master` branch.
322
Josh Driverfb2d7632017-02-23 10:45:30323Compiling all of `./x.py test` can take a while. When testing your pull request,
324consider using one of the more specialized `./x.py` targets to cut down on the
Steve Klabnik720da312015-07-06 18:46:21325amount of time you have to wait. You need to have built the compiler at least
326once before running these will work, but that’s only one full build rather than
327one each time.
328
Alex Crichton0e272de2016-11-16 20:31:19329 $ python x.py test --stage 1
Steve Klabnik720da312015-07-06 18:46:21330
331is one such example, which builds just `rustc`, and then runs the tests. If
332you’re adding something to the standard library, try
333
Alex Crichton0e272de2016-11-16 20:31:19334 $ python x.py test src/libstd --stage 1
Steve Klabnik720da312015-07-06 18:46:21335
Cobrand9d9c0292016-09-03 10:41:02336Please make sure your pull request is in compliance with Rust's style
337guidelines by running
338
Alex Crichton0e272de2016-11-16 20:31:19339 $ python x.py test src/tools/tidy
Cobrand9d9c0292016-09-03 10:41:02340
341Make this check before every pull request (and every new commit in a pull
342request) ; you can add [git hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)
343before every push to make sure you never forget to make this check.
344
Steve Klabnikf645cad2015-02-13 17:26:44345All pull requests are reviewed by another person. We have a bot,
edunham177531e2015-05-27 14:29:02346@rust-highfive, that will automatically assign a random person to review your
347request.
Steve Klabnikf645cad2015-02-13 17:26:44348
349If you want to request that a specific person reviews your pull request,
350you can add an `r?` to the message. For example, Steve usually reviews
351documentation changes. So if you were to make a documentation change, add
352
353 r? @steveklabnik
354
355to the end of the message, and @rust-highfive will assign @steveklabnik instead
356of a random person. This is entirely optional.
357
358After someone has reviewed your pull request, they will leave an annotation
359on the pull request with an `r+`. It will look something like this:
360
361 @bors: r+ 38fe8d2
362
363This tells @bors, our lovable integration bot, that your pull request has
364been approved. The PR then enters the [merge queue][merge-queue], where @bors
365will run all the tests on every platform we support. If it all works out,
366@bors will merge your code into `master` and close the pull request.
367
Sam Cappleman-Lynesc3293112017-07-17 10:57:26368[merge-queue]: https://buildbot2.rust-lang.org/homu/queue/rust
Steve Klabnikf645cad2015-02-13 17:26:44369
Steve Klabnik8cb1faa2015-07-06 16:14:49370Speaking of tests, Rust has a comprehensive test suite. More information about
Kazuyoshi Katof656fe32018-09-13 04:21:43371it can be found [here][rctd].
Steve Klabnik8cb1faa2015-07-06 16:14:49372
Oliver Schneider49fca852017-08-15 16:06:10373### External Dependencies
Garrett Bergdaf3ed52017-09-29 23:19:17374[external-dependencies]: #external-dependencies
Oliver Schneider49fca852017-08-15 16:06:10375
376Currently building Rust will also build the following external projects:
377
378* [clippy](https://github.com/rust-lang-nursery/rust-clippy)
Oliver Schneiderd64a0672017-09-18 11:13:57379* [miri](https://github.com/solson/miri)
kennytmd7488c32017-12-07 08:37:06380* [rustfmt](https://github.com/rust-lang-nursery/rustfmt)
381* [rls](https://github.com/rust-lang-nursery/rls/)
Oliver Schneider49fca852017-08-15 16:06:10382
kennytmd7488c32017-12-07 08:37:06383We allow breakage of these tools in the nightly channel. Maintainers of these
384projects will be notified of the breakages and should fix them as soon as
385possible.
Michal Budzynskie6c3c7f2017-09-17 23:24:29386
kennytmd7488c32017-12-07 08:37:06387After the external is fixed, one could add the changes with
Michal Budzynskie6c3c7f2017-09-17 23:24:29388
kennytmd7488c32017-12-07 08:37:06389```sh
Michal Budzynskie6c3c7f2017-09-17 23:24:29390git add path/to/submodule
391```
392
393outside the submodule.
Oliver Schneider49fca852017-08-15 16:06:10394
kennytmd7488c32017-12-07 08:37:06395In order to prepare your tool-fixing PR, you can run the build locally by doing
Niko Matsakis09caa122017-09-21 17:46:52396`./x.py build src/tools/TOOL`. If you will be editing the sources
397there, you may wish to set `submodules = false` in the `config.toml`
398to prevent `x.py` from resetting to the original branch.
Oliver Schneider49fca852017-08-15 16:06:10399
kennytmd7488c32017-12-07 08:37:06400Breakage is not allowed in the beta and stable channels, and must be addressed
401before the PR is merged.
402
Sunjay Varma790604a2017-10-18 02:51:10403#### Breaking Tools Built With The Compiler
404[breaking-tools-built-with-the-compiler]: #breaking-tools-built-with-the-compiler
Sunjay Varmabd4907d2017-10-08 01:53:43405
Sunjay Varma790604a2017-10-18 02:51:10406Rust's build system builds a number of tools that make use of the
Philipp Kronesfa751112018-08-28 18:43:10407internals of the compiler. This includes
408[Clippy](https://github.com/rust-lang-nursery/rust-clippy),
Sunjay Varma790604a2017-10-18 02:51:10409[RLS](https://github.com/rust-lang-nursery/rls) and
410[rustfmt](https://github.com/rust-lang-nursery/rustfmt). If these tools
Sunjay Varmabd4907d2017-10-08 01:53:43411break because of your changes, you may run into a sort of "chicken and egg"
Sunjay Varma790604a2017-10-18 02:51:10412problem. These tools rely on the latest compiler to be built so you can't update
413them to reflect your changes to the compiler until those changes are merged into
414the compiler. At the same time, you can't get your changes merged into the compiler
415because the rust-lang/rust build won't pass until those tools build and pass their
416tests.
Sunjay Varmabd4907d2017-10-08 01:53:43417
Sunjay Varma790604a2017-10-18 02:51:10418That means that, in the default state, you can't update the compiler without first
419fixing rustfmt, rls and the other tools that the compiler builds.
Sunjay Varmabd4907d2017-10-08 01:53:43420
kennytmd7488c32017-12-07 08:37:06421Luckily, a feature was [added to Rust's build](https://github.com/rust-lang/rust/issues/45861)
422to make all of this easy to handle. The idea is that we allow these tools to be "broken",
Sunjay Varma790604a2017-10-18 02:51:10423so that the rust-lang/rust build passes without trying to build them, then land the change
424in the compiler, wait for a nightly, and go update the tools that you broke. Once you're done
kennytmd7488c32017-12-07 08:37:06425and the tools are working again, you go back in the compiler and update the tools
426so they can be distributed again.
Sunjay Varmabd4907d2017-10-08 01:53:43427
Sunjay Varma790604a2017-10-18 02:51:10428This should avoid a bunch of synchronization dances and is also much easier on contributors as
429there's no need to block on rls/rustfmt/other tools changes going upstream.
430
431Here are those same steps in detail:
432
4331. (optional) First, if it doesn't exist already, create a `config.toml` by copying
Sunjay Varmabd4907d2017-10-08 01:53:43434 `config.toml.example` in the root directory of the Rust repository.
435 Set `submodules = false` in the `[build]` section. This will prevent `x.py`
Sunjay Varma3f90c3a2017-10-10 20:31:43436 from resetting to the original branch after you make your changes. If you
437 need to [update any submodules to their latest versions][updating-submodules],
438 see the section of this file about that for more information.
Sunjay Varma790604a2017-10-18 02:51:104392. (optional) Run `./x.py test src/tools/rustfmt` (substituting the submodule
440 that broke for `rustfmt`). Fix any errors in the submodule (and possibly others).
4413. (optional) Make commits for your changes and send them to upstream repositories as a PR.
4424. (optional) Maintainers of these submodules will **not** merge the PR. The PR can't be
443 merged because CI will be broken. You'll want to write a message on the PR referencing
444 your change, and how the PR should be merged once your change makes it into a nightly.
kennytmd7488c32017-12-07 08:37:064455. Wait for your PR to merge.
4466. Wait for a nightly
4477. (optional) Help land your PR on the upstream repository now that your changes are in nightly.
4488. (optional) Send a PR to rust-lang/rust updating the submodule.
Sunjay Varmabd4907d2017-10-08 01:53:43449
Sunjay Varma3f90c3a2017-10-10 20:31:43450#### Updating submodules
451[updating-submodules]: #updating-submodules
452
453These instructions are specific to updating `rustfmt`, however they may apply
454to the other submodules as well. Please help by improving these instructions
Martin Lindheece9a572017-11-21 14:33:45455if you find any discrepancies or special cases that need to be addressed.
Sunjay Varma3f90c3a2017-10-10 20:31:43456
457To update the `rustfmt` submodule, start by running the appropriate
458[`git submodule` command](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
459For example, to update to the latest commit on the remote master branch,
460you may want to run:
461```
462git submodule update --remote src/tools/rustfmt
463```
464If you run `./x.py build` now, and you are lucky, it may just work. If you see
465an error message about patches that did not resolve to any crates, you will need
466to complete a few more steps which are outlined with their rationale below.
467
468*(This error may change in the future to include more information.)*
469```
470error: failed to resolve patches for `https://github.com/rust-lang-nursery/rustfmt`
471
472Caused by:
473 patch for `rustfmt-nightly` in `https://github.com/rust-lang-nursery/rustfmt` did not resolve to any crates
474failed to run: ~/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path ~/rust/src/bootstrap/Cargo.toml
475```
476
477If you haven't used the `[patch]`
478section of `Cargo.toml` before, there is [some relevant documentation about it
479in the cargo docs](http://doc.crates.io/manifest.html#the-patch-section). In
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32480addition to that, you should read the
Sunjay Varma3f90c3a2017-10-10 20:31:43481[Overriding dependencies](http://doc.crates.io/specifying-dependencies.html#overriding-dependencies)
482section of the documentation as well.
483
484Specifically, the following [section in Overriding dependencies](http://doc.crates.io/specifying-dependencies.html#testing-a-bugfix) reveals what the problem is:
485
486> Next up we need to ensure that our lock file is updated to use this new version of uuid so our project uses the locally checked out copy instead of one from crates.io. The way [patch] works is that it'll load the dependency at ../path/to/uuid and then whenever crates.io is queried for versions of uuid it'll also return the local version.
Ariel Ben-Yehudaf68e11b2017-12-20 19:22:32487>
Sunjay Varma3f90c3a2017-10-10 20:31:43488> This means that the version number of the local checkout is significant and will affect whether the patch is used. Our manifest declared uuid = "1.0" which means we'll only resolve to >= 1.0.0, < 2.0.0, and Cargo's greedy resolution algorithm also means that we'll resolve to the maximum version within that range. Typically this doesn't matter as the version of the git repository will already be greater or match the maximum version published on crates.io, but it's important to keep this in mind!
489
490This says that when we updated the submodule, the version number in our
491`src/tools/rustfmt/Cargo.toml` changed. The new version is different from
492the version in `Cargo.lock`, so the build can no longer continue.
493
494To resolve this, we need to update `Cargo.lock`. Luckily, cargo provides a
495command to do this easily.
496
Sunjay Varma3f90c3a2017-10-10 20:31:43497```
Sunjay Varma3f90c3a2017-10-10 20:31:43498$ cargo update -p rustfmt-nightly
499```
500
Eduard-Mihai Burtescu7c166f52018-08-22 02:50:46501This should change the version listed in `Cargo.lock` to the new version you updated
Sunjay Varma3f90c3a2017-10-10 20:31:43502the submodule to. Running `./x.py build` should work now.
503
Steve Klabnikf645cad2015-02-13 17:26:44504## Writing Documentation
Garrett Bergdaf3ed52017-09-29 23:19:17505[writing-documentation]: #writing-documentation
Steve Klabnikf645cad2015-02-13 17:26:44506
507Documentation improvements are very welcome. The source of `doc.rust-lang.org`
508is located in `src/doc` in the tree, and standard API documentation is generated
509from the source code itself.
510
Vladimir Rutskyb85aa782015-06-30 22:57:54511Documentation pull requests function in the same way as other pull requests,
512though you may see a slightly different form of `r+`:
Steve Klabnikf645cad2015-02-13 17:26:44513
514 @bors: r+ 38fe8d2 rollup
515
516That additional `rollup` tells @bors that this change is eligible for a 'rollup'.
517To save @bors some work, and to get small changes through more quickly, when
518@bors attempts to merge a commit that's rollup-eligible, it will also merge
519the other rollup-eligible patches too, and they'll get tested and merged at
520the same time.
521
lukaramu3b0add42017-03-24 20:16:00522To find documentation-related issues, sort by the [T-doc label][tdoc].
edunham177531e2015-05-27 14:29:02523
lukaramu3b0add42017-03-24 20:16:00524[tdoc]: https://github.com/rust-lang/rust/issues?q=is%3Aopen%20is%3Aissue%20label%3AT-doc
lukaramu7643ccd2017-03-24 20:28:59525
526You can find documentation style guidelines in [RFC 1574][rfc1574].
527
lukaramu3b0add42017-03-24 20:16:00528[rfc1574]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md#appendix-a-full-conventions-text
edunham177531e2015-05-27 14:29:02529
Josh Driverfb2d7632017-02-23 10:45:30530In many cases, you don't need a full `./x.py doc`. You can use `rustdoc` directly
Aleksey Kladovc3753ce2015-10-02 21:09:27531to check small fixes. For example, `rustdoc src/doc/reference.md` will render
532reference to `doc/reference.html`. The CSS might be messed up, but you can
Amit Levy4b6477f2016-08-22 02:42:33533verify that the HTML is right.
Aleksey Kladovc3753ce2015-10-02 21:09:27534
Steve Klabnikf645cad2015-02-13 17:26:44535## Issue Triage
Garrett Bergdaf3ed52017-09-29 23:19:17536[issue-triage]: #issue-triage
Steve Klabnikf645cad2015-02-13 17:26:44537
538Sometimes, an issue will stay open, even though the bug has been fixed. And
539sometimes, the original bug may go stale because something has changed in the
540meantime.
541
542It can be helpful to go through older bug reports and make sure that they are
543still valid. Load up an older issue, double check that it's still true, and
edunham177531e2015-05-27 14:29:02544leave a comment letting us know if it is or is not. The [least recently
545updated sort][lru] is good for finding issues like this.
Steve Klabnikf645cad2015-02-13 17:26:44546
edunham177531e2015-05-27 14:29:02547Contributors with sufficient permissions on the Rust repo can help by adding
548labels to triage issues:
549
550* Yellow, **A**-prefixed labels state which **area** of the project an issue
Aleksey Kladove3596e32015-10-02 21:08:14551 relates to.
edunham177531e2015-05-27 14:29:02552
Greg Chapplea5836fa2016-01-14 10:47:04553* Magenta, **B**-prefixed labels identify bugs which are **blockers**.
edunham177531e2015-05-27 14:29:02554
Carol (Nichols || Goulding)69b94942017-09-10 17:21:37555* Dark blue, **beta-** labels track changes which need to be backported into
556 the beta branches.
557
Carol (Nichols || Goulding)28fc93f2017-09-10 17:31:08558* Light purple, **C**-prefixed labels represent the **category** of an issue.
559
edunham177531e2015-05-27 14:29:02560* Green, **E**-prefixed labels explain the level of **experience** necessary
561 to fix the issue.
562
Carol (Nichols || Goulding)28fc93f2017-09-10 17:31:08563* The dark blue **final-comment-period** label marks bugs that are using the
jacob84f75f02018-10-02 21:59:48564 RFC signoff functionality of [rfcbot][rfcbot] and are currently in the final
Carol (Nichols || Goulding)28fc93f2017-09-10 17:31:08565 comment period.
566
edunham177531e2015-05-27 14:29:02567* Red, **I**-prefixed labels indicate the **importance** of the issue. The
568 [I-nominated][inom] label indicates that an issue has been nominated for
Aleksey Kladove3596e32015-10-02 21:08:14569 prioritizing at the next triage meeting.
edunham177531e2015-05-27 14:29:02570
Carol (Nichols || Goulding)69b94942017-09-10 17:21:37571* The purple **metabug** label marks lists of bugs collected by other
572 categories.
573
Carol (Nichols || Goulding)28fc93f2017-09-10 17:31:08574* Purple gray, **O**-prefixed labels are the **operating system** or platform
575 that this issue is specific to.
576
edunham177531e2015-05-27 14:29:02577* Orange, **P**-prefixed labels indicate a bug's **priority**. These labels
578 are only assigned during triage meetings, and replace the [I-nominated][inom]
Aleksey Kladove3596e32015-10-02 21:08:14579 label.
edunham177531e2015-05-27 14:29:02580
Carol (Nichols || Goulding)28fc93f2017-09-10 17:31:08581* The gray **proposed-final-comment-period** label marks bugs that are using
582 the RFC signoff functionality of [rfcbot][rfcbot] and are currently awaiting
583 signoff of all team members in order to enter the final comment period.
584
585* Pink, **regression**-prefixed labels track regressions from stable to the
586 release channels.
587
588* The light orange **relnotes** label marks issues that should be documented in
589 the release notes of the next release.
590
591* Gray, **S**-prefixed labels are used for tracking the **status** of pull
592 requests.
593
edunham177531e2015-05-27 14:29:02594* Blue, **T**-prefixed bugs denote which **team** the issue belongs to.
595
Aleksey Kladove3596e32015-10-02 21:08:14596If you're looking for somewhere to start, check out the [E-easy][eeasy] tag.
edunham177531e2015-05-27 14:29:02597
598[inom]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AI-nominated
599[eeasy]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy
Steve Klabnikf645cad2015-02-13 17:26:44600[lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
lukasluegf513fbd2018-03-27 18:56:15601[rfcbot]: https://github.com/anp/rfcbot-rs/
Steve Klabnikf645cad2015-02-13 17:26:44602
603## Out-of-tree Contributions
Garrett Bergdaf3ed52017-09-29 23:19:17604[out-of-tree-contributions]: #out-of-tree-contributions
Steve Klabnikf645cad2015-02-13 17:26:44605
606There are a number of other ways to contribute to Rust that don't deal with
607this repository.
608
609Answer questions in [#rust][pound-rust], or on [users.rust-lang.org][users],
610or on [StackOverflow][so].
611
612Participate in the [RFC process](https://github.com/rust-lang/rfcs).
613
614Find a [requested community library][community-library], build it, and publish
615it to [Crates.io](http://crates.io). Easier said than done, but very, very
616valuable!
617
618[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
Eli Friedmanbbbfed22015-08-09 21:15:05619[users]: https://users.rust-lang.org/
Steve Klabnikf645cad2015-02-13 17:26:44620[so]: http://stackoverflow.com/questions/tagged/rust
621[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library
christopherdumas3f866022015-09-11 23:21:11622
623## Helpful Links and Information
Garrett Bergdaf3ed52017-09-29 23:19:17624[helpful-info]: #helpful-info
christopherdumas3f866022015-09-11 23:21:11625
626For people new to Rust, and just starting to contribute, or even for
627more seasoned developers, some useful places to look for information
628are:
629
Mark Mansia05c5532018-02-23 19:20:56630* The [rustc guide] contains information about how various parts of the compiler work
Niko Matsakis9276b8b2017-09-22 20:27:55631* [Rust Forge][rustforge] contains additional documentation, including write-ups of how to achieve common tasks
christopherdumas3f866022015-09-11 23:21:11632* The [Rust Internals forum][rif], a place to ask questions and
633 discuss Rust's internals
634* The [generated documentation for rust's compiler][gdfrustc]
Andreas Sommeraa9666e2015-10-02 12:36:27635* The [rust reference][rr], even though it doesn't specifically talk about Rust's internals, it's a great resource nonetheless
christopherdumas3f866022015-09-11 23:21:11636* Although out of date, [Tom Lee's great blog article][tlgba] is very helpful
637* [rustaceans.org][ro] is helpful, but mostly dedicated to IRC
christopherdumasd09ba5d2015-09-12 15:02:01638* The [Rust Compiler Testing Docs][rctd]
christopherdumas4543dad2015-09-14 14:28:06639* For @bors, [this cheat sheet][cheatsheet] is helpful (Remember to replace `@homu` with `@bors` in the commands that you use.)
Andreas Sommeraa9666e2015-10-02 12:36:27640* **Google!** ([search only in Rust Documentation][gsearchdocs] to find types, traits, etc. quickly)
christopherdumas3f866022015-09-11 23:21:11641* Don't be afraid to ask! The Rust community is friendly and helpful.
642
Mark Mansi6494f1e2018-11-26 21:03:13643[rustc guide]: https://rust-lang.github.io/rustc-guide/about-this-guide.html
Do Duye03d24e2018-10-15 08:54:29644[gdfrustc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
fbergraa219d92015-12-23 20:42:36645[gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here
christopherdumas3f866022015-09-11 23:21:11646[rif]: http://internals.rust-lang.org
647[rr]: https://doc.rust-lang.org/book/README.html
Santiago Pastorino84dfade2017-09-22 20:10:51648[rustforge]: https://forge.rust-lang.org/
Florian Bergerdaa48a22016-04-15 19:28:32649[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
christopherdumas3f866022015-09-11 23:21:11650[ro]: http://www.rustaceans.org/
Mark Mansi6494f1e2018-11-26 21:03:13651[rctd]: https://rust-lang.github.io/rustc-guide/tests/intro.html
Corey Farwellc7cd79b2017-08-21 01:24:14652[cheatsheet]: https://buildbot2.rust-lang.org/homu/