Rollup of 7 pull requests #46745
Merged
Rollup of 7 pull requests #46745
Conversation
This file contains 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
Dec 15, 2017
steveklabnik
commented
- Successful merges: Use a better link for method resolution in Deref docs #46601, ThinLTO: updates for LLVM 5 #46652, Expose the line and column fields from the proc_macro::LineColumn struct #46690, Help Cargo tolerate RUSTFLAGS="--print=native-static-libs" #46705, Remove Sync and Send implementation for RawTable #46710, Fix division-by-zero ICE in -Z perf-stats #46728, doc: a better example #46737
- Failed merges:
The implementation was introduced when changing hash storage from Unique to *mut, but it was changed back to Unique.
An invalid average now simply prints “N/A”. Fixes rust-lang#46725.
…=steveklabnik Use a better link for method resolution in Deref docs rust-lang/reference#149 breaks these links, so make them point to somewhere which won't break and provides a more deatailed description of method resolution. cc @Havvy r? @steveklabnik
…lexcrichton ThinLTO: updates for LLVM 5 refs: llvm-mirror/llvm@ccb80b9 llvm-mirror/llvm@e611018
Expose the line and column fields from the proc_macro::LineColumn struct Right now the `LineColumn` struct is pretty useless because the fields are private. This patch just marks the fields as public, which seems like the easiest solution.
Help Cargo tolerate RUSTFLAGS="--print=native-static-libs" Alternative to rust-lang/cargo#4807 Having this "error" message was a mistake, as it's firing at exactly wrong time when Cargo is trying to read the output of other print commands.
Remove Sync and Send implementation for RawTable The implementation was introduced when changing hash storage from Unique to *mut, but it was changed back to Unique.
Fix division-by-zero ICE in -Z perf-stats An invalid average now simply prints “N/A”. Fixes rust-lang#46725.
doc: a better example Closes rust-lang#46734
|
r? @KodrAus (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit b98de5d has been approved by |
bors
added a commit
that referenced
this pull request
Dec 15, 2017
|
☀️ Test successful - status-appveyor, status-travis |
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.