Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 1 | # Contributing to Rust |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 2 | [contributing-to-rust]: #contributing-to-rust |
Tim Chevalier | 5afd760 | 2013-10-21 19:10:57 | [diff] [blame] | 3 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 4 | Thank you for your interest in contributing to Rust! There are many ways to |
| 5 | contribute, and we appreciate all of them. This document is a bit long, so here's |
| 6 | links to the major sections: |
Tim Chevalier | 5afd760 | 2013-10-21 19:10:57 | [diff] [blame] | 7 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 8 | * [Feature Requests](#feature-requests) |
| 9 | * [Bug Reports](#bug-reports) |
Greg Chapple | dc6ed63 | 2016-01-25 14:07:10 | [diff] [blame] | 10 | * [The Build System](#the-build-system) |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 11 | * [Pull Requests](#pull-requests) |
| 12 | * [Writing Documentation](#writing-documentation) |
| 13 | * [Issue Triage](#issue-triage) |
| 14 | * [Out-of-tree Contributions](#out-of-tree-contributions) |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 15 | * [Helpful Links and Information](#helpful-links-and-information) |
Tim Chevalier | 5afd760 | 2013-10-21 19:10:57 | [diff] [blame] | 16 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 17 | If you have questions, please make a post on [internals.rust-lang.org][internals] or |
varkor | 205ab0c | 2019-03-14 01:04:19 | [diff] [blame] | 18 | hop on the [Rust Discord server][rust-discord], [Rust Zulip server][rust-zulip] or [#rust-internals][pound-rust-internals]. |
Nick Cameron | 852cef8 | 2014-09-22 00:46:24 | [diff] [blame] | 19 | |
Darrell Hamilton | a6b47c0 | 2015-02-19 03:53:00 | [diff] [blame] | 20 | As a reminder, all contributors are expected to follow our [Code of Conduct][coc]. |
Brian Anderson | 36c63a3 | 2015-01-02 23:41:47 | [diff] [blame] | 21 | |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 22 | The [rustc-guide] is your friend! It describes how the compiler works and how |
| 23 | to contribute to it in more detail than this document. |
| 24 | |
| 25 | If this is your first time contributing, the [walkthrough] chapter of the guide |
| 26 | can give you a good example of how a typical contribution would go. |
| 27 | |
Suriyaa ✌️️ | 2d108ec | 2017-10-03 10:36:16 | [diff] [blame] | 28 | [pound-rust-internals]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals |
Eli Friedman | bbbfed2 | 2015-08-09 21:15:05 | [diff] [blame] | 29 | [internals]: https://internals.rust-lang.org |
varkor | 205ab0c | 2019-03-14 01:04:19 | [diff] [blame] | 30 | [rust-discord]: http://discord.gg/rust-lang |
| 31 | [rust-zulip]: https://rust-lang.zulipchat.com |
Eli Friedman | bbbfed2 | 2015-08-09 21:15:05 | [diff] [blame] | 32 | [coc]: https://www.rust-lang.org/conduct.html |
varkor | ff5e31f | 2019-03-14 01:02:56 | [diff] [blame] | 33 | [rustc-guide]: https://rust-lang.github.io/rustc-guide/ |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 34 | [walkthrough]: https://rust-lang.github.io/rustc-guide/walkthrough.html |
Brian Anderson | 36c63a3 | 2015-01-02 23:41:47 | [diff] [blame] | 35 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 36 | ## Feature Requests |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 37 | [feature-requests]: #feature-requests |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 38 | |
Kurtis Nusbaum | f9c5b1f | 2018-03-03 19:12:09 | [diff] [blame] | 39 | To request a change to the way the Rust language works, please head over |
varkor | 6e449da | 2019-03-14 01:03:11 | [diff] [blame] | 40 | to the [RFCs repository](https://github.com/rust-lang/rfcs) and view the |
Kurtis Nusbaum | f9c5b1f | 2018-03-03 19:12:09 | [diff] [blame] | 41 | [README](https://github.com/rust-lang/rfcs/blob/master/README.md) |
| 42 | for instructions. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 43 | |
| 44 | ## Bug Reports |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 45 | [bug-reports]: #bug-reports |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 46 | |
| 47 | While bugs are unfortunate, they're a reality in software. We can't fix what we |
| 48 | don't know about, so please report liberally. If you're not sure if something |
| 49 | is a bug or not, feel free to file a bug anyway. |
| 50 | |
Brian Anderson | 0d0cb3b | 2015-11-06 22:05:19 | [diff] [blame] | 51 | **If you believe reporting your bug publicly represents a security risk to Rust users, |
Jens Hausdorf | 3866710 | 2018-12-09 14:25:23 | [diff] [blame] | 52 | please follow our [instructions for reporting security vulnerabilities](https://www.rust-lang.org/policies/security)**. |
Brian Anderson | 0d0cb3b | 2015-11-06 22:05:19 | [diff] [blame] | 53 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 54 | If you have the chance, before reporting a bug, please [search existing |
| 55 | issues](https://github.com/rust-lang/rust/search?q=&type=Issues&utf8=%E2%9C%93), |
| 56 | as it's possible that someone else has already reported your error. This doesn't |
| 57 | always work, and sometimes it's hard to know what to search for, so consider this |
| 58 | extra credit. We won't mind if you accidentally file a duplicate report. |
| 59 | |
Niv Kaminer | 79b1127 | 2018-04-21 09:08:01 | [diff] [blame] | 60 | Similarly, to help others who encountered the bug find your issue, |
Lukas Bergdoll | 0bc8d4e | 2018-06-08 17:44:04 | [diff] [blame] | 61 | consider filing an issue with a descriptive title, which contains information that might be unique to it. |
Niv Kaminer | 79b1127 | 2018-04-21 09:08:01 | [diff] [blame] | 62 | This can be the language or compiler feature used, the conditions that trigger the bug, |
| 63 | or part of the error message if there is any. |
| 64 | An example could be: **"impossible case reached" on lifetime inference for impl Trait in return position**. |
| 65 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 66 | Opening an issue is as easy as following [this |
| 67 | link](https://github.com/rust-lang/rust/issues/new) and filling out the fields. |
| 68 | Here's a template that you can use to file a bug, though it's not necessary to |
| 69 | use it exactly: |
| 70 | |
| 71 | <short summary of the bug> |
| 72 | |
| 73 | I tried this code: |
| 74 | |
| 75 | <code sample that causes the bug> |
| 76 | |
| 77 | I expected to see this happen: <explanation> |
| 78 | |
| 79 | Instead, this happened: <explanation> |
| 80 | |
| 81 | ## Meta |
| 82 | |
| 83 | `rustc --version --verbose`: |
| 84 | |
| 85 | Backtrace: |
| 86 | |
| 87 | All three components are important: what you did, what you expected, what |
| 88 | happened instead. Please include the output of `rustc --version --verbose`, |
| 89 | which includes important information about what platform you're on, what |
| 90 | version of Rust you're using, etc. |
| 91 | |
| 92 | Sometimes, a backtrace is helpful, and so including that is nice. To get |
Emanuel Czirai | e1d2eda | 2016-03-28 12:41:55 | [diff] [blame] | 93 | a backtrace, set the `RUST_BACKTRACE` environment variable to a value |
| 94 | other than `0`. The easiest way |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 95 | to do this is to invoke `rustc` like this: |
| 96 | |
| 97 | ```bash |
| 98 | $ RUST_BACKTRACE=1 rustc ... |
| 99 | ``` |
| 100 | |
Greg Chapple | dc6ed63 | 2016-01-25 14:07:10 | [diff] [blame] | 101 | ## The Build System |
| 102 | |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 103 | For info on how to configure and build the compiler, please see [this |
| 104 | chapter][rustcguidebuild] of the rustc-guide. This chapter contains info for |
| 105 | contributions to the compiler and the standard library. It also lists some |
| 106 | really useful commands to the build system (`./x.py`), which could save you a |
| 107 | lot of time. |
Greg Chapple | dc6ed63 | 2016-01-25 14:07:10 | [diff] [blame] | 108 | |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 109 | [rustcguidebuild]: https://rust-lang.github.io/rustc-guide/how-to-build-and-run.html |
Ariel Ben-Yehuda | f68e11b | 2017-12-20 19:22:32 | [diff] [blame] | 110 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 111 | ## Pull Requests |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 112 | [pull-requests]: #pull-requests |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 113 | |
| 114 | Pull requests are the primary mechanism we use to change Rust. GitHub itself |
Matthew Walinga | 9a4287d | 2018-01-18 23:05:33 | [diff] [blame] | 115 | has some [great documentation][about-pull-requests] on using the Pull Request feature. |
Tej Chajed | a746129 | 2017-08-12 11:28:29 | [diff] [blame] | 116 | We use the "fork and pull" model [described here][development-models], where |
| 117 | contributors push changes to their personal fork and create pull requests to |
| 118 | bring those changes into the source repository. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 119 | |
Matthew Walinga | 9a4287d | 2018-01-18 23:05:33 | [diff] [blame] | 120 | [about-pull-requests]: https://help.github.com/articles/about-pull-requests/ |
Tej Chajed | a746129 | 2017-08-12 11:28:29 | [diff] [blame] | 121 | [development-models]: https://help.github.com/articles/about-collaborative-development-models/ |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 122 | |
| 123 | Please make pull requests against the `master` branch. |
| 124 | |
Cobrand | 9d9c029 | 2016-09-03 10:41:02 | [diff] [blame] | 125 | Please make sure your pull request is in compliance with Rust's style |
| 126 | guidelines by running |
| 127 | |
Alex Crichton | 0e272de | 2016-11-16 20:31:19 | [diff] [blame] | 128 | $ python x.py test src/tools/tidy |
Cobrand | 9d9c029 | 2016-09-03 10:41:02 | [diff] [blame] | 129 | |
| 130 | Make this check before every pull request (and every new commit in a pull |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 131 | request); you can add [git hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks) |
Cobrand | 9d9c029 | 2016-09-03 10:41:02 | [diff] [blame] | 132 | before every push to make sure you never forget to make this check. |
| 133 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 134 | All pull requests are reviewed by another person. We have a bot, |
varkor | 6f3fda9 | 2019-03-14 01:07:00 | [diff] [blame] | 135 | [@rust-highfive][rust-highfive], that will automatically assign a random person to review your |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 136 | request. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 137 | |
| 138 | If you want to request that a specific person reviews your pull request, |
varkor | 308a002 | 2019-03-14 01:13:26 | [diff] [blame] | 139 | you can add an `r?` to the message. For example, [Steve][steveklabnik] usually reviews |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 140 | documentation changes. So if you were to make a documentation change, add |
| 141 | |
| 142 | r? @steveklabnik |
| 143 | |
varkor | 308a002 | 2019-03-14 01:13:26 | [diff] [blame] | 144 | to the end of the message, and @rust-highfive will assign [@steveklabnik][steveklabnik] instead |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 145 | of a random person. This is entirely optional. |
| 146 | |
| 147 | After someone has reviewed your pull request, they will leave an annotation |
| 148 | on the pull request with an `r+`. It will look something like this: |
| 149 | |
varkor | eadb844 | 2019-03-14 01:09:32 | [diff] [blame] | 150 | @bors r+ |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 151 | |
varkor | 6f3fda9 | 2019-03-14 01:07:00 | [diff] [blame] | 152 | This tells [@bors][bors], our lovable integration bot, that your pull request has |
varkor | 308a002 | 2019-03-14 01:13:26 | [diff] [blame] | 153 | been approved. The PR then enters the [merge queue][merge-queue], where [@bors][bors] |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 154 | will run all the tests on every platform we support. If it all works out, |
varkor | 308a002 | 2019-03-14 01:13:26 | [diff] [blame] | 155 | [@bors][bors] will merge your code into `master` and close the pull request. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 156 | |
varkor | 3a00649 | 2019-03-14 01:17:49 | [diff] [blame] | 157 | Depending on the scale of the change, you may see a slightly different form of `r+`: |
| 158 | |
| 159 | @bors r+ rollup |
| 160 | |
| 161 | The additional `rollup` tells [@bors][bors] that this change is eligible for to be |
| 162 | "rolled up". Changes that are rolled up are tested and merged at the same time, to |
| 163 | speed the process up. Typically only small changes that are expected not to conflict |
| 164 | with one another are rolled up. |
| 165 | |
varkor | 6f3fda9 | 2019-03-14 01:07:00 | [diff] [blame] | 166 | [rust-highfive]: https://github.com/rust-highfive |
varkor | 308a002 | 2019-03-14 01:13:26 | [diff] [blame] | 167 | [steveklabnik]: https://github.com/steveklabnik |
varkor | 6f3fda9 | 2019-03-14 01:07:00 | [diff] [blame] | 168 | [bors]: https://github.com/bors |
Sam Cappleman-Lynes | c329311 | 2017-07-17 10:57:26 | [diff] [blame] | 169 | [merge-queue]: https://buildbot2.rust-lang.org/homu/queue/rust |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 170 | |
Steve Klabnik | 8cb1faa | 2015-07-06 16:14:49 | [diff] [blame] | 171 | Speaking of tests, Rust has a comprehensive test suite. More information about |
Kazuyoshi Kato | f656fe3 | 2018-09-13 04:21:43 | [diff] [blame] | 172 | it can be found [here][rctd]. |
Steve Klabnik | 8cb1faa | 2015-07-06 16:14:49 | [diff] [blame] | 173 | |
Oliver Schneider | 49fca85 | 2017-08-15 16:06:10 | [diff] [blame] | 174 | ### External Dependencies |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 175 | [external-dependencies]: #external-dependencies |
Oliver Schneider | 49fca85 | 2017-08-15 16:06:10 | [diff] [blame] | 176 | |
| 177 | Currently building Rust will also build the following external projects: |
| 178 | |
Philipp Hansch | 36f6652 | 2019-02-21 19:58:56 | [diff] [blame] | 179 | * [clippy](https://github.com/rust-lang/rust-clippy) |
Philipp Hansch | 4867a8c | 2019-02-21 18:26:45 | [diff] [blame] | 180 | * [miri](https://github.com/rust-lang/miri) |
Philipp Hansch | 36f6652 | 2019-02-21 19:58:56 | [diff] [blame] | 181 | * [rustfmt](https://github.com/rust-lang/rustfmt) |
| 182 | * [rls](https://github.com/rust-lang/rls/) |
Oliver Schneider | 49fca85 | 2017-08-15 16:06:10 | [diff] [blame] | 183 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 184 | We allow breakage of these tools in the nightly channel. Maintainers of these |
| 185 | projects will be notified of the breakages and should fix them as soon as |
| 186 | possible. |
Michal Budzynski | e6c3c7f | 2017-09-17 23:24:29 | [diff] [blame] | 187 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 188 | After the external is fixed, one could add the changes with |
Michal Budzynski | e6c3c7f | 2017-09-17 23:24:29 | [diff] [blame] | 189 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 190 | ```sh |
Michal Budzynski | e6c3c7f | 2017-09-17 23:24:29 | [diff] [blame] | 191 | git add path/to/submodule |
| 192 | ``` |
| 193 | |
| 194 | outside the submodule. |
Oliver Schneider | 49fca85 | 2017-08-15 16:06:10 | [diff] [blame] | 195 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 196 | In order to prepare your tool-fixing PR, you can run the build locally by doing |
Niko Matsakis | 09caa12 | 2017-09-21 17:46:52 | [diff] [blame] | 197 | `./x.py build src/tools/TOOL`. If you will be editing the sources |
| 198 | there, you may wish to set `submodules = false` in the `config.toml` |
| 199 | to prevent `x.py` from resetting to the original branch. |
Oliver Schneider | 49fca85 | 2017-08-15 16:06:10 | [diff] [blame] | 200 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 201 | Breakage is not allowed in the beta and stable channels, and must be addressed |
| 202 | before the PR is merged. |
| 203 | |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 204 | #### Breaking Tools Built With The Compiler |
| 205 | [breaking-tools-built-with-the-compiler]: #breaking-tools-built-with-the-compiler |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 206 | |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 207 | Rust's build system builds a number of tools that make use of the |
varkor | 6e449da | 2019-03-14 01:03:11 | [diff] [blame] | 208 | internals of the compiler. This includes |
Philipp Hansch | 36f6652 | 2019-02-21 19:58:56 | [diff] [blame] | 209 | [Clippy](https://github.com/rust-lang/rust-clippy), |
| 210 | [RLS](https://github.com/rust-lang/rls) and |
| 211 | [rustfmt](https://github.com/rust-lang/rustfmt). If these tools |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 212 | break because of your changes, you may run into a sort of "chicken and egg" |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 213 | problem. These tools rely on the latest compiler to be built so you can't update |
| 214 | them to reflect your changes to the compiler until those changes are merged into |
| 215 | the compiler. At the same time, you can't get your changes merged into the compiler |
| 216 | because the rust-lang/rust build won't pass until those tools build and pass their |
| 217 | tests. |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 218 | |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 219 | That means that, in the default state, you can't update the compiler without first |
| 220 | fixing rustfmt, rls and the other tools that the compiler builds. |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 221 | |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 222 | Luckily, a feature was [added to Rust's build](https://github.com/rust-lang/rust/issues/45861) |
| 223 | to make all of this easy to handle. The idea is that we allow these tools to be "broken", |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 224 | so that the rust-lang/rust build passes without trying to build them, then land the change |
| 225 | in the compiler, wait for a nightly, and go update the tools that you broke. Once you're done |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 226 | and the tools are working again, you go back in the compiler and update the tools |
| 227 | so they can be distributed again. |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 228 | |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 229 | This should avoid a bunch of synchronization dances and is also much easier on contributors as |
| 230 | there's no need to block on rls/rustfmt/other tools changes going upstream. |
| 231 | |
| 232 | Here are those same steps in detail: |
| 233 | |
| 234 | 1. (optional) First, if it doesn't exist already, create a `config.toml` by copying |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 235 | `config.toml.example` in the root directory of the Rust repository. |
| 236 | Set `submodules = false` in the `[build]` section. This will prevent `x.py` |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 237 | from resetting to the original branch after you make your changes. If you |
| 238 | need to [update any submodules to their latest versions][updating-submodules], |
| 239 | see the section of this file about that for more information. |
Sunjay Varma | 790604a | 2017-10-18 02:51:10 | [diff] [blame] | 240 | 2. (optional) Run `./x.py test src/tools/rustfmt` (substituting the submodule |
| 241 | that broke for `rustfmt`). Fix any errors in the submodule (and possibly others). |
| 242 | 3. (optional) Make commits for your changes and send them to upstream repositories as a PR. |
| 243 | 4. (optional) Maintainers of these submodules will **not** merge the PR. The PR can't be |
| 244 | merged because CI will be broken. You'll want to write a message on the PR referencing |
| 245 | your change, and how the PR should be merged once your change makes it into a nightly. |
kennytm | d7488c3 | 2017-12-07 08:37:06 | [diff] [blame] | 246 | 5. Wait for your PR to merge. |
| 247 | 6. Wait for a nightly |
| 248 | 7. (optional) Help land your PR on the upstream repository now that your changes are in nightly. |
| 249 | 8. (optional) Send a PR to rust-lang/rust updating the submodule. |
Sunjay Varma | bd4907d | 2017-10-08 01:53:43 | [diff] [blame] | 250 | |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 251 | #### Updating submodules |
| 252 | [updating-submodules]: #updating-submodules |
| 253 | |
| 254 | These instructions are specific to updating `rustfmt`, however they may apply |
| 255 | to the other submodules as well. Please help by improving these instructions |
Martin Lindhe | ece9a57 | 2017-11-21 14:33:45 | [diff] [blame] | 256 | if you find any discrepancies or special cases that need to be addressed. |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 257 | |
| 258 | To update the `rustfmt` submodule, start by running the appropriate |
| 259 | [`git submodule` command](https://git-scm.com/book/en/v2/Git-Tools-Submodules). |
| 260 | For example, to update to the latest commit on the remote master branch, |
| 261 | you may want to run: |
| 262 | ``` |
| 263 | git submodule update --remote src/tools/rustfmt |
| 264 | ``` |
| 265 | If you run `./x.py build` now, and you are lucky, it may just work. If you see |
| 266 | an error message about patches that did not resolve to any crates, you will need |
| 267 | to complete a few more steps which are outlined with their rationale below. |
| 268 | |
| 269 | *(This error may change in the future to include more information.)* |
| 270 | ``` |
Philipp Hansch | 36f6652 | 2019-02-21 19:58:56 | [diff] [blame] | 271 | error: failed to resolve patches for `https://github.com/rust-lang/rustfmt` |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 272 | |
| 273 | Caused by: |
Philipp Hansch | 36f6652 | 2019-02-21 19:58:56 | [diff] [blame] | 274 | patch for `rustfmt-nightly` in `https://github.com/rust-lang/rustfmt` did not resolve to any crates |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 275 | failed to run: ~/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path ~/rust/src/bootstrap/Cargo.toml |
| 276 | ``` |
| 277 | |
| 278 | If you haven't used the `[patch]` |
| 279 | section of `Cargo.toml` before, there is [some relevant documentation about it |
| 280 | in the cargo docs](http://doc.crates.io/manifest.html#the-patch-section). In |
Ariel Ben-Yehuda | f68e11b | 2017-12-20 19:22:32 | [diff] [blame] | 281 | addition to that, you should read the |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 282 | [Overriding dependencies](http://doc.crates.io/specifying-dependencies.html#overriding-dependencies) |
| 283 | section of the documentation as well. |
| 284 | |
| 285 | Specifically, the following [section in Overriding dependencies](http://doc.crates.io/specifying-dependencies.html#testing-a-bugfix) reveals what the problem is: |
| 286 | |
| 287 | > 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-Yehuda | f68e11b | 2017-12-20 19:22:32 | [diff] [blame] | 288 | > |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 289 | > 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! |
| 290 | |
| 291 | This says that when we updated the submodule, the version number in our |
| 292 | `src/tools/rustfmt/Cargo.toml` changed. The new version is different from |
| 293 | the version in `Cargo.lock`, so the build can no longer continue. |
| 294 | |
| 295 | To resolve this, we need to update `Cargo.lock`. Luckily, cargo provides a |
| 296 | command to do this easily. |
| 297 | |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 298 | ``` |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 299 | $ cargo update -p rustfmt-nightly |
| 300 | ``` |
| 301 | |
Eduard-Mihai Burtescu | 7c166f5 | 2018-08-22 02:50:46 | [diff] [blame] | 302 | This should change the version listed in `Cargo.lock` to the new version you updated |
Sunjay Varma | 3f90c3a | 2017-10-10 20:31:43 | [diff] [blame] | 303 | the submodule to. Running `./x.py build` should work now. |
| 304 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 305 | ## Writing Documentation |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 306 | [writing-documentation]: #writing-documentation |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 307 | |
| 308 | Documentation improvements are very welcome. The source of `doc.rust-lang.org` |
| 309 | is located in `src/doc` in the tree, and standard API documentation is generated |
varkor | 3a00649 | 2019-03-14 01:17:49 | [diff] [blame] | 310 | from the source code itself. Documentation pull requests function in the same way |
| 311 | as other pull requests. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 312 | |
lukaramu | 3b0add4 | 2017-03-24 20:16:00 | [diff] [blame] | 313 | To find documentation-related issues, sort by the [T-doc label][tdoc]. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 314 | |
lukaramu | 3b0add4 | 2017-03-24 20:16:00 | [diff] [blame] | 315 | [tdoc]: https://github.com/rust-lang/rust/issues?q=is%3Aopen%20is%3Aissue%20label%3AT-doc |
lukaramu | 7643ccd | 2017-03-24 20:28:59 | [diff] [blame] | 316 | |
| 317 | You can find documentation style guidelines in [RFC 1574][rfc1574]. |
| 318 | |
lukaramu | 3b0add4 | 2017-03-24 20:16:00 | [diff] [blame] | 319 | [rfc1574]: https://github.com/rust-lang/rfcs/blob/master/text/1574-more-api-documentation-conventions.md#appendix-a-full-conventions-text |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 320 | |
Josh Driver | fb2d763 | 2017-02-23 10:45:30 | [diff] [blame] | 321 | In many cases, you don't need a full `./x.py doc`. You can use `rustdoc` directly |
Aleksey Kladov | c3753ce | 2015-10-02 21:09:27 | [diff] [blame] | 322 | to check small fixes. For example, `rustdoc src/doc/reference.md` will render |
| 323 | reference to `doc/reference.html`. The CSS might be messed up, but you can |
Amit Levy | 4b6477f | 2016-08-22 02:42:33 | [diff] [blame] | 324 | verify that the HTML is right. |
Aleksey Kladov | c3753ce | 2015-10-02 21:09:27 | [diff] [blame] | 325 | |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 326 | Additionally, contributions to the [rustc-guide] are always welcome. Contributions |
| 327 | can be made directly at [the |
| 328 | rust-lang/rustc-guide](https://github.com/rust-lang/rustc-guide) repo. The issue |
| 329 | tracker in that repo is also a great way to find things that need doing. There |
| 330 | are issues for beginners and advanced compiler devs alike! |
| 331 | |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 332 | ## Issue Triage |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 333 | [issue-triage]: #issue-triage |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 334 | |
| 335 | Sometimes, an issue will stay open, even though the bug has been fixed. And |
| 336 | sometimes, the original bug may go stale because something has changed in the |
| 337 | meantime. |
| 338 | |
| 339 | It can be helpful to go through older bug reports and make sure that they are |
| 340 | still valid. Load up an older issue, double check that it's still true, and |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 341 | leave a comment letting us know if it is or is not. The [least recently |
| 342 | updated sort][lru] is good for finding issues like this. |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 343 | |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 344 | Contributors with sufficient permissions on the Rust repo can help by adding |
| 345 | labels to triage issues: |
| 346 | |
| 347 | * Yellow, **A**-prefixed labels state which **area** of the project an issue |
Aleksey Kladov | e3596e3 | 2015-10-02 21:08:14 | [diff] [blame] | 348 | relates to. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 349 | |
Greg Chapple | a5836fa | 2016-01-14 10:47:04 | [diff] [blame] | 350 | * Magenta, **B**-prefixed labels identify bugs which are **blockers**. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 351 | |
Carol (Nichols || Goulding) | 69b9494 | 2017-09-10 17:21:37 | [diff] [blame] | 352 | * Dark blue, **beta-** labels track changes which need to be backported into |
| 353 | the beta branches. |
| 354 | |
Carol (Nichols || Goulding) | 28fc93f | 2017-09-10 17:31:08 | [diff] [blame] | 355 | * Light purple, **C**-prefixed labels represent the **category** of an issue. |
| 356 | |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 357 | * Green, **E**-prefixed labels explain the level of **experience** necessary |
| 358 | to fix the issue. |
| 359 | |
Carol (Nichols || Goulding) | 28fc93f | 2017-09-10 17:31:08 | [diff] [blame] | 360 | * The dark blue **final-comment-period** label marks bugs that are using the |
jacob | 84f75f0 | 2018-10-02 21:59:48 | [diff] [blame] | 361 | RFC signoff functionality of [rfcbot][rfcbot] and are currently in the final |
Carol (Nichols || Goulding) | 28fc93f | 2017-09-10 17:31:08 | [diff] [blame] | 362 | comment period. |
| 363 | |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 364 | * Red, **I**-prefixed labels indicate the **importance** of the issue. The |
| 365 | [I-nominated][inom] label indicates that an issue has been nominated for |
Aleksey Kladov | e3596e3 | 2015-10-02 21:08:14 | [diff] [blame] | 366 | prioritizing at the next triage meeting. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 367 | |
Carol (Nichols || Goulding) | 69b9494 | 2017-09-10 17:21:37 | [diff] [blame] | 368 | * The purple **metabug** label marks lists of bugs collected by other |
| 369 | categories. |
| 370 | |
Carol (Nichols || Goulding) | 28fc93f | 2017-09-10 17:31:08 | [diff] [blame] | 371 | * Purple gray, **O**-prefixed labels are the **operating system** or platform |
| 372 | that this issue is specific to. |
| 373 | |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 374 | * Orange, **P**-prefixed labels indicate a bug's **priority**. These labels |
| 375 | are only assigned during triage meetings, and replace the [I-nominated][inom] |
Aleksey Kladov | e3596e3 | 2015-10-02 21:08:14 | [diff] [blame] | 376 | label. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 377 | |
Carol (Nichols || Goulding) | 28fc93f | 2017-09-10 17:31:08 | [diff] [blame] | 378 | * The gray **proposed-final-comment-period** label marks bugs that are using |
| 379 | the RFC signoff functionality of [rfcbot][rfcbot] and are currently awaiting |
| 380 | signoff of all team members in order to enter the final comment period. |
| 381 | |
| 382 | * Pink, **regression**-prefixed labels track regressions from stable to the |
| 383 | release channels. |
| 384 | |
| 385 | * The light orange **relnotes** label marks issues that should be documented in |
| 386 | the release notes of the next release. |
| 387 | |
| 388 | * Gray, **S**-prefixed labels are used for tracking the **status** of pull |
| 389 | requests. |
| 390 | |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 391 | * Blue, **T**-prefixed bugs denote which **team** the issue belongs to. |
| 392 | |
Aleksey Kladov | e3596e3 | 2015-10-02 21:08:14 | [diff] [blame] | 393 | If you're looking for somewhere to start, check out the [E-easy][eeasy] tag. |
edunham | 177531e | 2015-05-27 14:29:02 | [diff] [blame] | 394 | |
| 395 | [inom]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AI-nominated |
| 396 | [eeasy]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 397 | [lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc |
lukaslueg | f513fbd | 2018-03-27 18:56:15 | [diff] [blame] | 398 | [rfcbot]: https://github.com/anp/rfcbot-rs/ |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 399 | |
| 400 | ## Out-of-tree Contributions |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 401 | [out-of-tree-contributions]: #out-of-tree-contributions |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 402 | |
| 403 | There are a number of other ways to contribute to Rust that don't deal with |
| 404 | this repository. |
| 405 | |
| 406 | Answer questions in [#rust][pound-rust], or on [users.rust-lang.org][users], |
| 407 | or on [StackOverflow][so]. |
| 408 | |
| 409 | Participate in the [RFC process](https://github.com/rust-lang/rfcs). |
| 410 | |
| 411 | Find a [requested community library][community-library], build it, and publish |
| 412 | it to [Crates.io](http://crates.io). Easier said than done, but very, very |
| 413 | valuable! |
| 414 | |
| 415 | [pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust |
Eli Friedman | bbbfed2 | 2015-08-09 21:15:05 | [diff] [blame] | 416 | [users]: https://users.rust-lang.org/ |
Steve Klabnik | f645cad | 2015-02-13 17:26:44 | [diff] [blame] | 417 | [so]: http://stackoverflow.com/questions/tagged/rust |
| 418 | [community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 419 | |
| 420 | ## Helpful Links and Information |
Garrett Berg | daf3ed5 | 2017-09-29 23:19:17 | [diff] [blame] | 421 | [helpful-info]: #helpful-info |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 422 | |
| 423 | For people new to Rust, and just starting to contribute, or even for |
| 424 | more seasoned developers, some useful places to look for information |
| 425 | are: |
| 426 | |
mark | 48bee07 | 2019-01-16 02:02:28 | [diff] [blame] | 427 | * The [rustc guide] contains information about how various parts of the compiler work and how to contribute to the compiler |
Niko Matsakis | 9276b8b | 2017-09-22 20:27:55 | [diff] [blame] | 428 | * [Rust Forge][rustforge] contains additional documentation, including write-ups of how to achieve common tasks |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 429 | * The [Rust Internals forum][rif], a place to ask questions and |
| 430 | discuss Rust's internals |
| 431 | * The [generated documentation for rust's compiler][gdfrustc] |
Andreas Sommer | aa9666e | 2015-10-02 12:36:27 | [diff] [blame] | 432 | * The [rust reference][rr], even though it doesn't specifically talk about Rust's internals, it's a great resource nonetheless |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 433 | * Although out of date, [Tom Lee's great blog article][tlgba] is very helpful |
| 434 | * [rustaceans.org][ro] is helpful, but mostly dedicated to IRC |
christopherdumas | d09ba5d | 2015-09-12 15:02:01 | [diff] [blame] | 435 | * The [Rust Compiler Testing Docs][rctd] |
varkor | 037596c | 2019-03-14 01:20:41 | [diff] [blame] | 436 | * For [@bors][bors], [this cheat sheet][cheatsheet] is helpful |
| 437 | (though you'll need to replace `@homu` with `@bors` in any commands) |
Andreas Sommer | aa9666e | 2015-10-02 12:36:27 | [diff] [blame] | 438 | * **Google!** ([search only in Rust Documentation][gsearchdocs] to find types, traits, etc. quickly) |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 439 | * Don't be afraid to ask! The Rust community is friendly and helpful. |
| 440 | |
Mark Mansi | 6494f1e | 2018-11-26 21:03:13 | [diff] [blame] | 441 | [rustc guide]: https://rust-lang.github.io/rustc-guide/about-this-guide.html |
Do Duy | e03d24e | 2018-10-15 08:54:29 | [diff] [blame] | 442 | [gdfrustc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ |
fbergr | aa219d9 | 2015-12-23 20:42:36 | [diff] [blame] | 443 | [gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 444 | [rif]: http://internals.rust-lang.org |
| 445 | [rr]: https://doc.rust-lang.org/book/README.html |
Santiago Pastorino | 84dfade | 2017-09-22 20:10:51 | [diff] [blame] | 446 | [rustforge]: https://forge.rust-lang.org/ |
Florian Berger | daa48a2 | 2016-04-15 19:28:32 | [diff] [blame] | 447 | [tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/ |
christopherdumas | 3f86602 | 2015-09-11 23:21:11 | [diff] [blame] | 448 | [ro]: http://www.rustaceans.org/ |
Mark Mansi | 6494f1e | 2018-11-26 21:03:13 | [diff] [blame] | 449 | [rctd]: https://rust-lang.github.io/rustc-guide/tests/intro.html |
Corey Farwell | c7cd79b | 2017-08-21 01:24:14 | [diff] [blame] | 450 | [cheatsheet]: https://buildbot2.rust-lang.org/homu/ |