Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Updated the docs for Error::description #37189

Merged
merged 3 commits into from Oct 18, 2016
Merged

Updated the docs for Error::description #37189

merged 3 commits into from Oct 18, 2016

Conversation

omern1
Copy link
Contributor

@omern1 omern1 commented Oct 15, 2016

Fixes #37163

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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.

killercup
killercup reviewed Oct 15, 2016
View reviewed changes
src/libstd/error.rs
/// It should not contain newlines or sentence-ending punctuation,
/// to facilitate embedding in larger user-facing strings.
/// For showing formatted error messages with more information see
/// (Display)[https://doc.rust-lang.org/std/fmt/trait.Display.html].
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Markdown links work the other way around: [text](url).

Copy link
Contributor Author

@omern1 omern1 Oct 15, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks.

frewsxcv
frewsxcv reviewed Oct 15, 2016
View reviewed changes
src/libstd/error.rs
/// It should not contain newlines or sentence-ending punctuation,
/// to facilitate embedding in larger user-facing strings.
/// For showing formatted error messages with more information see
/// [Display](https://doc.rust-lang.org/std/fmt/trait.Display.html).s
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to remove the 's' at the end of this line.

Copy link
Contributor Author

@omern1 omern1 Oct 15, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks.

@bluss
Copy link
Member

bluss commented Oct 16, 2016

Thank you!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 16, 2016

📌 Commit 16b8957 has been approved by bluss

@bors
Copy link
Contributor

bors commented Oct 16, 2016

⌛ Testing commit 16b8957 with merge 3f6627b...

@bors
Copy link
Contributor

bors commented Oct 16, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@omern1
Copy link
Contributor Author

omern1 commented Oct 16, 2016

@bluss This looks like a problem with the buildbot's git repository

fatal: Unable to create '/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt-rustbuild/build/.git/modules/src/llvm/index.lock': File exists.

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.

@bluss
Copy link
Member

bluss commented Oct 16, 2016

Yes, it just happened to a whole bunch of PRs unfortunately. We'll retry this as soon as it's working again.

@alexcrichton
Copy link
Member

@bors: retry

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Oct 17, 2016
@GuillaumeGomez
Rollup merge of rust-lang#37189 - nabeelomer:master, r=bluss
28416cb 
Updated the docs for Error::description

Fixes rust-lang#37163
@GuillaumeGomez GuillaumeGomez mentioned this pull request Oct 17, 2016
Merged
bors added a commit that referenced this pull request Oct 18, 2016
@bors
Auto merge of #37237 - GuillaumeGomez:rollup, r=GuillaumeGomez
1d3dfa5 
Rollup of 6 pull requests

- Successful merges: #37172, #37177, #37189, #37194, #37200, #37215
- Failed merges:
@bors bors merged commit 16b8957 into rust-lang:master Oct 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killercup killercup killercup left review comments

@frewsxcv frewsxcv frewsxcv left review comments

Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@omern1 @rust-highfive @bluss @bors @alexcrichton @killercup @frewsxcv