Rollup of 11 pull requests #25275
Closed
Rollup of 11 pull requests #25275
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
Contributor
steveklabnik
commented
May 10, 2015
steveklabnik
commented
- Successful merges: link to .editorconfig for Rust files #24948, Remove mentions of the old tilde owned pointer syntax #25085, Add #[inline(always)] to various instances of AsRef::as_ref and AsMut::as_mut #25158, Typo in ownership.md #25188, Fixed a typo. Removed an extra s. #25239, Add example for HashMap::entry() #25240, Added start of last text block #25241, Add a few diagnostic messages #25255, Trivial documentation changes in Mutability, Match #25257, Fix small typos in documentation #25263, doc: unwrap is discouraged, so use Some #25271
- Failed merges:
I've written a small [EditorConfig](http://editorconfig.org) file for Rust development.
The start of the last text block in references was missing, I added it.
I've written a small [EditorConfig](http://editorconfig.org) file for Rust development.
…teveklabnik There were still some mentions of `~[T]` and `~T`, mostly in comments and debugging statements. I tried to do my best to preserve meaning, but I might have gotten some wrong-- I'm happy to fix anything :)
I was profiling my code again and this time AsRef<str> for String was eating up a considerable chunk of my runtime; adding the inline annotation made the program run almost twice as fast! While I was at it I also added the annotation to other implementations of AsRef as well as AsMut.
…bnik Add example for HashMap::entry()
The start of the last text block in references was missing, I added it. r? @steveklabnik
…richton Add a few diagnostic messages; part of rust-lang#24407.
…eklabnik I think there's a trivial missing word in the Mutability document. I reformatted the resulting paragraph in vim, which seems to match what the rest of the document is doing as far as word wrapping. Edit: I found another minor thing as I continued reading. P.S. I'm re-reading the docs, since so much has changed since my first read, and they've gotten even better! Nice job! r? @steveklabnik
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit 253612d has been approved by |
|
@bors: force |
|
⌛ Testing commit 253612d with merge d9ec142... |
|
💔 Test failed - auto-mac-64-opt |
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.