Rollup of 9 pull requests #45291
Closed
Rollup of 9 pull requests #45291
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
kennytm
commented
Oct 14, 2017
kennytm
commented
- Successful merges: Link std::process::Output to Command and Child #45113, Moved details of unstable non-ascii identifiers from the Reference #45250, Make Solaris builder compatible with Solaris 10 #45255, compiletest/runtest: format ErrorKind with Display #45258, Do some cleanups for hashmaps #45263, fix typo in src/bootstrap/README.md #45264, Fix TcpStream::connect_timeout on linux #45269, Remove terribly useless and problematic margin when searching on mobile #45280, Fix arrow display #45289
- Failed merges:
… the Unstable book
The strings are nouns for the most part, so we give ErrorKind::Help a more sensible string. This reduces quote hiccups in failure output. unexpected "error": '...' ↓ unexpected error: '...'
Linux appears to set POLLOUT when a conection's refused, which is pretty weird. Invert the check to look for an error explicitly. Also add an explict test for this case. Closes rust-lang#45265.
This offset is always zero, and we don't consistently take it into account. This is okay, because it's zero, but if it ever changes we're going to have bugs (e.g. in the `dealloc` call, where we don't take it into account). It's better to remove this for now; if we ever have a need for a nonzero offset we can add it back, and handle it properly when we do so.
This isn't strictly necessary for hashmap cloning to work. The tag is used to hint for an upcoming resize, so it's good to copy this information over. (We can do cleverer things like actually resizing the hashmap when we see the tag, or even cleaning up the entry order, but this requires more thought and might not be worth it)
…labnik Link std::process::Output to Command and Child As per rust-lang#29370
… r=steveklabnik Moved details of unstable non-ascii identifiers from the Reference Moved details of unstable non-ascii identifiers from the Reference to the Unstable book r? @steveklabnik
Make Solaris builder compatible with Solaris 10 Would it be possible to get this in the next 1.22.0 beta?
compiletest/runtest: format ErrorKind with Display The strings are nouns for the most part, so we give ErrorKind::Help a more sensible string. This reduces quote hiccups in failure output. unexpected "error": '...' ↓ unexpected error: '...'
Do some cleanups for hashmaps @mystor noticed some things whilst reading through the hashmap RawTable code. Firstly, in RawTable we deal with this hash_offset value that is the offset of the list of hashes from the buffer start. This is always zero, and this isn't consistently used (which means that we would have bugs if we set it to something else). We should just remove this since it doesn't help us at all. Secondly, the probing length tag is not copied when cloning a raw table. This is minor and basically means we do a bit more work than we need on further inserts on a cloned hashmap. r? @gankro
…nnytm fix typo in src/bootstrap/README.md
…xcrichton Fix TcpStream::connect_timeout on linux Linux appears to set POLLOUT when a conection's refused, which is pretty weird. Invert the check to look for an error explicitly. Also add an explict test for this case. Closes rust-lang#45265. r? @alexcrichton
…=kennytm Remove terribly useless and problematic margin when searching on mobile Before: <img width="1440" alt="screen shot 2017-10-14 at 15 56 09" src="https://user-images.githubusercontent.com/3050060/31576308-54af4e48-b0f8-11e7-9e2e-375febbb87b2.png"> After: <img width="1440" alt="screen shot 2017-10-14 at 15 55 52" src="https://user-images.githubusercontent.com/3050060/31576304-5216ae74-b0f8-11e7-88a0-f53f293f5499.png"> r? @rust-lang/docs
Fix arrow display Before: <img width="1440" alt="screen shot 2017-10-14 at 18 36 18" src="https://user-images.githubusercontent.com/3050060/31577437-a81510e8-b10e-11e7-8249-cf074bb0f59a.png"> After: <img width="1440" alt="screen shot 2017-10-14 at 18 36 12" src="https://user-images.githubusercontent.com/3050060/31577436-a7fc0eea-b10e-11e7-96d7-6dc2916ef72f.png"> r? @rust-lang/docs
|
Some changes occurred in HTML/CSS. |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=9 |
|
📌 Commit ef95645 has been approved by |
kennytm
added
the
S-waiting-on-bors
|
#45269 didn't work on OSX or Windows - it's fixed now but you'll need to update. |
bors
added a commit
that referenced
this pull request
Oct 14, 2017
|
💔 Test failed - status-appveyor |
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.