Rollup of 8 pull requests#48158

kennytm · 2018-02-12T10:46:10Z

Successful merges: Work around LLVM OCAML binding installation failure #47846, Show better warning for trying to cast non-u8 scalar to char #48033, Add Range[Inclusive]::is_empty #48087, Upgrade the Travis CI macOS images for testing from Xcode 8.3 to 9.2. #48114, Whitelist pclmulqdq x86 feature flag #48126, Correct a few stability attributes #48130, typo: correct endianess to endianness (this also changes function names!) #48133, Update ops range example to avoid confusion between indexes and values. #48151
Failed merges:

During the RFC, it was discussed that figuring out whether a range is empty was subtle, and thus there should be a clear and obvious way to do it. It can't just be ExactSizeIterator::is_empty (also unstable) because not all ranges are ExactSize -- not even Range<i32> or RangeInclusive<usize>.

Relevant `stdsimd` [issue](rust-lang/stdarch#318).

…es!)

…h NAN

Work around LLVM OCAML binding installation failure Hello, I have OCaml installed on my machine, and compiling rust systematically fails when LLVM attempts installing the OCaml bindings in `/usr/lib/ocaml`, which is write-protected. Here are the logs: https://gist.github.com/roblabla/3f147914c5df627c9d97ab311ba133ad Some digging around the issue reveals: - The code that finds if OCaml is installed, and sets the bindings to be compiled/installed: https://github.com/llvm-mirror/llvm/blob/b24a45d2e9f4fc10c3f9e16172104910b38637f2/cmake/config-ix.cmake#L612 - https://github.com/llvm-mirror/llvm/blob/b24a45d2e9f4fc10c3f9e16172104910b38637f2/bindings/ocaml/llvm/CMakeLists.txt Some code that does the installation. The problem seems to be that `LLVM_OCAML_INSTALL_PATH` is set to `OCAML_STDLIB_PATH` by default, which is in `/usr/lib/ocaml`, instead of the prefix. This PR "fixes" the issue by setting `LLVM_OCAML_INSTALL_PATH` to `usr/lib/ocaml`. I haven't found a way to make LLVM not build OCaml, which would probably be a superior fix.

…sage, r=estebank Show better warning for trying to cast non-u8 scalar to char Fixes rust-lang#44201.

rust-highfive · 2018-02-12T10:46:21Z

r? @Mark-Simulacrum

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

kennytm · 2018-02-12T10:46:34Z

@bors r+ p=9

bors · 2018-02-12T10:46:35Z

📌 Commit 3b3ac6b has been approved by kennytm

bors · 2018-02-12T12:34:10Z

⌛ Testing commit 3b3ac6bd3575225bb8bee0a298cafe70aa055c37 with merge 25a8486d3a2728b5e7e06b66e67267f59e9abdf2...

bors · 2018-02-12T13:40:16Z

💔 Test failed - status-travis

…=estebank Update ops range example to avoid confusion between indexes and values. Makes clearer the numbers in the range refer to indexes, not the values at those indexes.

kennytm · 2018-02-12T13:58:44Z

@bors r+

Removed #48076 (comment).

bors · 2018-02-12T13:58:45Z

📌 Commit b4b49eb has been approved by kennytm

bors · 2018-02-12T18:46:00Z

⌛ Testing commit b4b49eb with merge 325ecf11e8c9b50ac447f7f2c970695ed567ff87...

Mark-Simulacrum · 2018-02-12T18:47:00Z

@bors retry : prioritize stable release

bors · 2018-02-12T21:49:09Z

⌛ Testing commit b4b49eb with merge 710e972...

Rollup of 8 pull requests - Successful merges: #47846, #48033, #48087, #48114, #48126, #48130, #48133, #48151 - Failed merges:

bors · 2018-02-13T00:14:06Z

💔 Test failed - status-travis

kennytm · 2018-02-13T04:35:45Z

@bors retry #48116

bors · 2018-02-13T04:58:23Z

⌛ Testing commit b4b49eb with merge fd6cde0e9eca98a34d204233efe65ce54ace6160...

bors · 2018-02-13T06:47:51Z

💔 Test failed - status-appveyor

kennytm · 2018-02-13T07:03:07Z

@bors retry #48116

kennytm · 2018-02-13T07:09:23Z

... Let's make a new one instead.

roblabla and others added 20 commits January 29, 2018 11:07

Work around LLVM OCAML binding installation failure

c04d86d

Fix tidy

7fe182f

Use is_empty in range iteration exhaustion tests

b5cb393

range_is_empty tracking issue is rust-lang#48111

6f70a11

Show better warning for trying to cast non-u8 scalar to char

0cccd9a

Whitelist pclmul x86 feature flag

14f488e

Relevant `stdsimd` [issue](rust-lang/stdarch#318).

typo fix

877272b

Add comment about the problem, and use provided path if available

3c01dea

Correct a few stability attributes

45d5a42

added conversion from Rust feature to LLVM feature

8be3068

iterator instead loop

c97aa09

typo: correct endianess to endianness (this also changes function nam…

161e8ff

…es!)

fixed errors

7c6adb4

Add the emptiness condition to the docs; add a PartialOrd example wit…

22b0489

…h NAN

Upgrade the Travis CI macOS images for testing from Xcode 8.3 to 9.2.

bf69b0f

Dangling pointer fix

c2a31de

Update ops range example to avoid confusion between indexes and values.

bd426f1

Rollup merge of rust-lang#48033 - GuillaumeGomez:better-char-cast-mes…

c268e6f

…sage, r=estebank Show better warning for trying to cast non-u8 scalar to char Fixes rust-lang#44201.

rust-highfive assigned Mark-Simulacrum Feb 12, 2018

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

kennytm unassigned Mark-Simulacrum Feb 12, 2018

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 12, 2018

Rollup merge of rust-lang#48151 - echochamber:update_range_example, r…

b4b49eb

…=estebank Update ops range example to avoid confusion between indexes and values. Makes clearer the numbers in the range refer to indexes, not the values at those indexes.

kennytm force-pushed the rollup branch from 3b3ac6b to b4b49eb Compare February 12, 2018 13:58

kennytm changed the title ~~Rollup of 9 pull requests~~ Rollup of 8 pull requests Feb 12, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2018

bors added a commit that referenced this pull request Feb 12, 2018

Auto merge of #48158 - kennytm:rollup, r=kennytm

710e972

Rollup of 8 pull requests - Successful merges: #47846, #48033, #48087, #48114, #48126, #48130, #48133, #48151 - Failed merges:

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 13, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 13, 2018

kennytm mentioned this pull request Feb 13, 2018

Spurious (?) error in "compile-fail\rfc-2126-extern-in-paths\single-segment.rs" etc #48116

Closed

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 13, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 13, 2018

kennytm closed this Feb 13, 2018

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

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rust-highfive commented Feb 12, 2018

Uh oh!

kennytm commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

kennytm commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

Mark-Simulacrum commented Feb 12, 2018

Uh oh!

bors commented Feb 12, 2018

Uh oh!

bors commented Feb 13, 2018

Uh oh!

kennytm commented Feb 13, 2018

Uh oh!

bors commented Feb 13, 2018

Uh oh!

bors commented Feb 13, 2018

Uh oh!

kennytm commented Feb 13, 2018

Uh oh!

kennytm commented Feb 13, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

kennytm commented Feb 12, 2018 •

edited

Loading