-
Notifications
You must be signed in to change notification settings - Fork 13.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rollup of 5 pull requests #42690
Rollup of 5 pull requests #42690
Conversation
frewsxcv
commented
Jun 16, 2017
- Successful merges: Position span label correctly when it isn't last #42616, Only run check-linkchecker when actually building docs #42651, Error codes new #42654, Remove struct_field_attributes feature gate #42656, Remove sometimes in std::io::Read doc #42685
- Failed merges:
We use it immediately in the next sentence, and the word is filler.
Otherwise the build fails, when running tests but not building docs, e.g.: https://buildd.debian.org/status/fetch.php?pkg=rustc&arch=ppc64el&ver=1.17.0%2Bdfsg2-3&stamp=1497403375&raw=0
Position span label correctly when it isn't last Fix rust-lang#42595. Before: ``` 15 | map.entry("e").or_insert(0) += 1; | ---------------------------^^^^^ot use `+=` on type `&mut {integer}` ``` After: ``` 15 | map.entry("e").or_insert(0) += 1; | ---------------------------^^^^^ | | | cannot use `+=` on type `&mut {integer}` ```
Only run check-linkchecker when actually building docs Otherwise the build fails, when running tests but not building docs, e.g.: https://buildd.debian.org/status/fetch.php?pkg=rustc&arch=ppc64el&ver=1.17.0%2Bdfsg2-3&stamp=1497403375&raw=0
…uietMisdreavus Error codes new Part of rust-lang#42229. cc @Susurrus @frewsxcv @QuietMisdreavus
…r=nikomatsakis Remove struct_field_attributes feature gate Part of rust-lang#41681. ~This PR only removes the feature gate; this *does not* update any documentations.~ This PR removes the feature gate and the corresponding chapter of the Unstable Book. I'm not very sure about the changes I made though... Just followed the stabilization guideline. r? @nikomatsakis
…klabnik Remove sometimes in std::io::Read doc We use it immediately in the next sentence, and the word is filler. A different conversation to make is whether we want to call them Readers in the documentation at all. And whether it's actually called "Readers" elsewhere.
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
@bors r+ p=10 |
📌 Commit f5f74a2 has been approved by |
⌛ Testing commit f5f74a2 with merge 4581e89... |
☀️ Test successful - status-appveyor, status-travis |