Rollup of 6 pull requests #32402
Merged
Rollup of 6 pull requests #32402
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
steveklabnik
commented
Mar 21, 2016
steveklabnik
commented
- Successful merges: Add doc examples #32322, docs: make some tiny modification about spelling #32339, Update of the book; Error handling, section on custom error types: we… #32340, docs: Correct an improper description #32373, Documentation fix for E0368 #32376, docs: Make some changes in texts #32397
- Failed merges:
… should also show the changes to the `cause` method.
In the example, we made a immutable borrow to `println!`, not a mutable one.
Made the 'good' example compile. I got to the E0368 error page by following the link in the output of the compiler. My understanding is that the first example is 'bad' and the second one is 'good'. Following that logic, I pasted the second example into the file and to my surprise it did not compile. This commit fixes the example to make it paste-able.
In my understanding, the description is somehow inappropriate.
Add doc examples Fixes rust-lang#29347 r? @steveklabnik
docs: make some tiny modification about spelling I think it would be better after modification.
Update of the book; Error handling, section on custom error types: we… … should also show the changes to the `cause` method. When I started creating my own error type, I found that we also have to update the cause method, otherwise we have a missing match branch. It would also be nice to elaborate on the relationship and difference between the description() and fmt() method, but that should be done by someone with more experience with them. :)
docs: Correct an improper description In the example, we made a immutable borrow to `println!`, not a mutable one.
…, r=steveklabnik Documentation fix for E0368 Made the 'good' example compile. I got to the [E0368 error page](https://doc.rust-lang.org/error-index.html#E0368) by following the link in the output of the compiler. My understanding is that the first example is 'bad' and the second one is 'good'. Following that logic, I pasted the second example into the file and to my surprise it did not compile. This commit fixes the example to make it paste-able. On the other hand the docstring contained `compile_fail` flag, which might indicate that this was intentional. I am also assuming here that the `Rust Compiler Error Index` page is generated from the file I changed. Please let me know what do you think. Thanks a lot !
docs: Make some changes in texts In my understanding, the description is somehow inappropriate.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit 6a3c7d5 has been approved by |
|
⌛ Testing commit 6a3c7d5 with merge ef13708... |
|
💔 Test failed - auto-win-gnu-64-opt |
|
@bors: retry On Mon, Mar 21, 2016 at 4:00 PM, bors [email protected] wrote:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.