Uh oh!
There was an error while loading. Please reload this page.
Update rustdoc book to suggest using Termination trait instead of hidden ‘foo’ function - #51183
Merged
Conversation
steveklabnik
suggested changes
May 31, 2018
steveklabnik
left a comment
Contributor
There was a problem hiding this comment.
This looks great, but I have one tiny grammar thing. Thank you so much for doing this!
Contributor
There was a problem hiding this comment.
I would change this slightly. This isn't wrong, but sounds a bit strange.
In your examples, handling all errors is not often useful, as it would add
emilyalbini
commented
Jun 4, 2018
Member
Ping from triage @steveklabnik! This PR needs your review. |
steveklabnik
approved these changes
Jun 4, 2018
steveklabnik
commented
Jun 4, 2018
Contributor
Thank you! @bors: r+ rollup |
bors
commented
Jun 4, 2018
Collaborator
📌 Commit efa8de8 has been approved by |
bors
commented
Jun 5, 2018
Collaborator
🔒 Merge conflict |
emilyalbini
commented
Jun 5, 2018
Member
@teiesti can you please rebase this PR on top of the latest master? |
teiesti
commented
Jun 5, 2018
ContributorAuthor
Done. |
emilyalbini
commented
Jun 5, 2018
Member
@steveklabnik this should be approved again. |
steveklabnik
commented
Jun 5, 2018
Contributor
@bors: r+ rollup |
bors
commented
Jun 5, 2018
Collaborator
📌 Commit 089da06 has been approved by |
Mark-Simulacrum added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jun 5, 2018
…=steveklabnik Update rustdoc book to suggest using Termination trait instead of hidden ‘foo’ function Closesrust-lang#50721. I suggest that someone double-checks my English since I am not a native speaker. r? @steveklabnik
bors added a commit
that referenced
this pull request
Jun 5, 2018
Rollup of 7 pull requests Successful merges: - #50852 (Add doc comment to hiding portions of code example) - #51183 (Update rustdoc book to suggest using Termination trait instead of hidden ‘foo’ function) - #51255 (Fix confusing error message for sub_instant) - #51256 (Fix crate-name option in rustdoc) - #51308 (Check array indices in constant propagation) - #51343 (test: Ignore some problematic tests on sparc and sparc64) - #51358 (Tests that #39963 is fixed on MIR borrowck) Failed merges:
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Closes#50721.
I suggest that someone double-checks my English since I am not a native speaker.
r? @steveklabnik