Rollup of 10 pull requests #47276
Merged
Rollup of 10 pull requests #47276
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
kennytm
commented
Jan 8, 2018
•
kennytm
commented
- Successful merges: fix the doc-comment-decoration-trimming edge-case rustdoc ICE #47210, Remove unused LLVM related code #47233, Make wasm obey backtrace feature, like other targets #47246, Replace empty array hack with repr(align) #47254, Rename ReprExtern to ReprC #47256, rustc::ty: Rename struct_variant to non_enum_variant #47258, Add HashMap::remove_entry #47259, rustdoc: Don't import macros from private imports #47263, Don't look for niches inside generator types. Fixes #47253 #47270, Add missing links #47272
- Failed merges: Upgrade liblibc to upstream version 0.2.35. #47248
This `horizontal_trim` function strips the leading whitespace from doc-comments that have a left-asterisk-margin: /** * You know what I mean— * * comments like this! */ The index of the column of asterisks is `i`, and if trimming is deemed possible, we slice each line from `i+1` to the end of the line. But if, in particular, `i` was 0 _and_ there was an empty line (as in the example given in the reporting issue), we ended up panicking trying to slice an empty string from 0+1 (== 1). Let's tighten our check to say that we can't trim when `i` is even the same as the length of the line, not just when it's greater. (Any such cases would panic trying to slice `line` from `line.len()+1`.) Resolves rust-lang#47197.
The same effect can be achieved using -Cllvm-args=-debug Refs rust-lang#46437 as it removes LLVMRustSetDebug()
Refs rust-lang#46437 as it also removes LLVMRustWriteDebugLocToString()
As a side effect, this fixes the warning about repr(C, simd) that has been reported during x86_64 windows builds since rust-lang#47111 (see also: rust-lang#47103)
…and locals that mentioned "extern repr"
Implements rust-lang#46344
It is also intended for use with unions.
…blems_in_computer_science, r=QuietMisdreavus fix the doc-comment-decoration-trimming edge-case rustdoc ICE This `horizontal_trim` function strips the leading whitespace from doc-comments that have a left-asterisk-margin: ``` /** * You know what I mean— * * comments like this! */ ``` The index of the column of asterisks is `i`, and if trimming is deemed possible, we slice each line from `i+1` to the end of the line. But if, in particular, `i` was 0 _and_ there was an empty line (as in the example given in the reporting issue), we ended up panicking trying to slice an empty string from 0+1 (== 1). Let's tighten our check to say that we can't trim when `i` is even the same as the length of the line, not just when it's greater. (Any such cases would panic trying to slice `line` from `line.len()+1`.) Resolves rust-lang#47197.
Remove unused LLVM related code Ticks a few more boxes on rust-lang#46437
…, r=KodrAus Make wasm obey backtrace feature, like other targets E.g. https://github.com/rust-lang/rust/blob/6828cf90146c7fefc4ba4f16dffe75f763f2d910/src/libstd/sys/unix/mod.rs#L40-L41
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=11 |
|
📌 Commit 97de5c1 has been approved by |
kennytm
added
the
S-waiting-on-bors
…richton Replace empty array hack with repr(align) As a side effect, this fixes the warning about repr(C, simd) that has been reported during x86_64 windows builds since rust-lang#47111 (see also: rust-lang#47103) r? @alexcrichton
Rename ReprExtern to ReprC … and similarily rename a few other field and locals that mentioned "extern repr".
rustc::ty: Rename struct_variant to non_enum_variant r? @eddyb
Add HashMap::remove_entry Implements rust-lang#46344 r? @dtolnay
…t, r=GuillaumeGomez rustdoc: Don't import macros from private imports Fixes rust-lang#47038
Don't look for niches inside generator types. Fixes rust-lang#47253 r? @eddyb
…etMisdreavus Add missing links r? @QuietMisdreavus (please wait for CI, I have a few doubts about the `Write` trait links...)
|
📌 Commit 9ef9854 has been approved by |
|
⌛ Testing commit 9ef9854 with merge 767b40396b16815dbe8a05d5be0b76f0835d6d00... |
|
💔 Test failed - status-appveyor |
|
@bors retry |
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Jan 9, 2018
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.