Rollup of 10 pull requests by kennytm · Pull Request #47276 · rust-lang/rust

kennytm · 2018-01-08T17:58:56Z

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`.) Resolvesrust-lang#47197.

The same effect can be achieved using -Cllvm-args=-debug Refs rust-lang#46437 as it removes LLVMRustSetDebug()

Refs rust-lang#46437

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`.) Resolvesrust-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 · 2018-01-08T17:59:07Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm · 2018-01-08T17:59:18Z

@bors r+ p=11

bors · 2018-01-08T17:59:19Z

📌 Commit 97de5c1 has been approved by kennytm

@alexcrichton

…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".

@eddyb

rustc::ty: Rename struct_variant to non_enum_variant r? @eddyb

@dtolnay

Add HashMap::remove_entry Implements rust-lang#46344 r? @dtolnay

…t, r=GuillaumeGomez rustdoc: Don't import macros from private imports Fixesrust-lang#47038

@eddyb

Don't look for niches inside generator types. Fixesrust-lang#47253 r? @eddyb

@QuietMisdreavus

…etMisdreavus Add missing links r? @QuietMisdreavus (please wait for CI, I have a few doubts about the `Write` trait links...)

kennytm · 2018-01-08T19:38:36Z

@bors r+

Removed #47248 — author changed code after r+.

bors · 2018-01-08T19:38:36Z

📌 Commit 9ef9854 has been approved by kennytm

bors · 2018-01-08T20:27:02Z

⌛ Testing commit 9ef9854 with merge 767b40396b16815dbe8a05d5be0b76f0835d6d00...

bors · 2018-01-08T23:27:42Z

💔 Test failed - status-appveyor

kennytm · 2018-01-09T03:12:52Z

@bors retry

Rollup of 10 pull requests - Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272 - Failed merges: #47248

bors · 2018-01-09T04:23:14Z

⌛ Testing commit 9ef9854 with merge 74966b5...

bors · 2018-01-09T07:12:02Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 74966b5 to master...

zackmdavisand others added 16 commits January 6, 2018 11:17

Make wasm obey backtrace feature, like other targets
fd37526

Remove redundant -Zdebug-llvm option
92189bc
The same effect can be achieved using -Cllvm-args=-debug Refs rust-lang#46437 as it removes LLVMRustSetDebug()

Remove dead function LLVMRustLinkInParsedExternalBitcode()
4be1d5c
Refs rust-lang#46437

Remove dead function rustc_llvm::debug_loc_to_string()
ebc8507
Refs rust-lang#46437 as it also removes LLVMRustWriteDebugLocToString()

Remove unused LLVMRustJITMemoryManagerRef typedef
907855f

Replace empty array hack with repr(align)
9e4a692
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)

Rename ReprExtern to ReprC, and similarily rename a few other fields …
1df384d
…and locals that mentioned "extern repr"

Add HashMap::remove_entry
1fc6ad5
Implements rust-lang#46344

rustc::ty: Rename struct_variant to non_enum_variant
cf3fefe
It is also intended for use with unions.

rustdoc: Don't import macros from private imports
8302044

Don't look for niches inside generator types.Fixesrust-lang#47253
1a7b00d

Add missing links
9396973

Rollup merge ofrust-lang#47233- dotdash:cleanup_llvm, r=alexcrichton
1cbbbc0
Remove unused LLVM related code Ticks a few more boxes on rust-lang#46437

Rollup merge ofrust-lang#47246- aidanhs:aphs-wasm-backtrace-feature…
9214e9b
…, 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 assigned nikomatsakis Jan 8, 2018

kennytm unassigned nikomatsakis Jan 8, 2018

kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 8, 2018

kennytm added 7 commits January 9, 2018 03:37

Rollup merge ofrust-lang#47256- rkruppe:misc-cleanup, r=eddyb
d72a509
Rename ReprExtern to ReprC … and similarily rename a few other field and locals that mentioned "extern repr".

Rollup merge ofrust-lang#47258- rkruppe:struct-assert, r=eddyb
6648dcd
rustc::ty: Rename struct_variant to non_enum_variant r? @eddyb

Rollup merge ofrust-lang#47259- sfackler:map-remove-entry, r=dtolnay
5ffaf4c
Add HashMap::remove_entry Implements rust-lang#46344 r? @dtolnay

Rollup merge ofrust-lang#47263- ollie27:rustdoc_private_macro_impor…
de4e1a9
…t, r=GuillaumeGomez rustdoc: Don't import macros from private imports Fixesrust-lang#47038

Rollup merge ofrust-lang#47270- Zoxc:gen-layout-fix, r=eddyb
9dd7cae
Don't look for niches inside generator types. Fixesrust-lang#47253 r? @eddyb

Rollup merge ofrust-lang#47272- GuillaumeGomez:missing-links, r=Qui…
9ef9854
…etMisdreavus Add missing links r? @QuietMisdreavus (please wait for CI, I have a few doubts about the `Write` trait links...)

kennytm force-pushed the rollup branch from 97de5c1 to 9ef9854Compare January 8, 2018 19:37

kennytm changed the title ~~Rollup of 11 pull requests~~Rollup of 10 pull requestsJan 8, 2018

bors added a commit that referenced this pull request Jan 9, 2018
Auto merge of#47276- kennytm:rollup, r=kennytm
74966b5
Rollup of 10 pull requests - Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272 - Failed merges: #47248

bors merged commit 9ef9854 into rust-lang:masterJan 9, 2018

This was referenced Jan 9, 2018
Allow runtime switching between trans backends #45684
Merged
Replace all const evaluation with miri #46882
Merged
Stabilized #[repr(align(x))] attribute (RFC 1358) #47006
Merged

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 10 pull requests - #47276

Rollup of 10 pull requests#47276
bors merged 23 commits into
rust-lang:masterfrom
kennytm:rollup

kennytm commented Jan 8, 2018•
edited
Loading

Uh oh!

rust-highfive commented Jan 8, 2018

Uh oh!

kennytm commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

kennytm commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

kennytm commented Jan 9, 2018

Uh oh!

bors commented Jan 9, 2018

Uh oh!

bors commented Jan 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

kennytm commented Jan 8, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jan 8, 2018

Uh oh!

kennytm commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

kennytm commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

bors commented Jan 8, 2018

Uh oh!

kennytm commented Jan 9, 2018

Uh oh!

bors commented Jan 9, 2018

Uh oh!

bors commented Jan 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

kennytm commented Jan 8, 2018•
edited
Loading