Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 8 pull requests #48158

Closed
wants to merge 26 commits into from
Closed

Rollup of 8 pull requests #48158

wants to merge 26 commits into from

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Feb 12, 2018 •
edited
Loading

roblabla and others added 20 commits January 29, 2018 11:07
@roblabla
Work around LLVM OCAML binding installation failure
c04d86d
@scottmcm
Add Range[Inclusive]::is_empty
4f8049a 
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>.
@scottmcm
Fix tidy
7fe182f
@scottmcm
Use is_empty in range iteration exhaustion tests
b5cb393
@scottmcm
range_is_empty tracking issue is rust-lang#48111
6f70a11
@GuillaumeGomez
Show better warning for trying to cast non-u8 scalar to char
0cccd9a
@newpavlov
Whitelist pclmul x86 feature flag
14f488e 
Relevant `stdsimd` [issue](rust-lang/stdarch#318).
@newpavlov
typo fix
877272b
@roblabla
Add comment about the problem, and use provided path if available
3c01dea
@ollie27
Correct a few stability attributes
45d5a42
@newpavlov
added conversion from Rust feature to LLVM feature
8be3068
@newpavlov
iterator instead loop
c97aa09
@matthiaskrgr
typo: correct endianess to endianness (this also changes function nam…
161e8ff 
…es!)
@newpavlov
fixed errors
7c6adb4
@scottmcm
Add the emptiness condition to the docs; add a PartialOrd example wit…
22b0489 
…h NAN
@kennytm
Upgrade the Travis CI macOS images for testing from Xcode 8.3 to 9.2.
bf69b0f
@newpavlov
Dangling pointer fix
c2a31de
Update ops range example to avoid confusion between indexes and values.
bd426f1
@kennytm
Rollup merge of rust-lang#47846 - roblabla:bugfix-ocaml, r=kennytm
ee1ce9d 
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.
@kennytm
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
Copy link
Collaborator

r? @Mark-Simulacrum

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

@kennytm
Copy link
Member Author

kennytm commented Feb 12, 2018

@bors r+ p=9

@bors
Copy link
Contributor

bors commented Feb 12, 2018

📌 Commit 3b3ac6b has been approved by kennytm

@bors 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
@bors
Copy link
Contributor

bors commented Feb 12, 2018

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

@bors
Copy link
Contributor

bors commented Feb 12, 2018

💔 Test failed - status-travis

@bors 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
@kennytm
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 kennytm changed the title Rollup of 9 pull requests Rollup of 8 pull requests Feb 12, 2018
@kennytm
Copy link
Member Author

kennytm commented Feb 12, 2018

@bors r+

Removed #48076 (comment).

@bors
Copy link
Contributor

bors commented Feb 12, 2018

📌 Commit b4b49eb has been approved by kennytm

@bors 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
Copy link
Contributor

bors commented Feb 12, 2018

⌛ Testing commit b4b49eb with merge 325ecf11e8c9b50ac447f7f2c970695ed567ff87...

@Mark-Simulacrum
Copy link
Member

@bors retry : prioritize stable release

@bors
Copy link
Contributor

bors commented Feb 12, 2018

⌛ Testing commit b4b49eb with merge 710e972...

bors added a commit that referenced this pull request Feb 12, 2018
@bors
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
Copy link
Contributor

bors commented Feb 13, 2018

💔 Test failed - status-travis

@bors 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
@kennytm
Copy link
Member Author

kennytm commented Feb 13, 2018

@bors retry #48116

@bors 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
@bors
Copy link
Contributor

bors commented Feb 13, 2018

⌛ Testing commit b4b49eb with merge fd6cde0e9eca98a34d204233efe65ce54ace6160...

@kennytm kennytm mentioned this pull request Feb 13, 2018
Closed
@bors
Copy link
Contributor

bors commented Feb 13, 2018

💔 Test failed - status-appveyor

@bors 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
@kennytm
Copy link
Member Author

kennytm commented Feb 13, 2018

@bors retry #48116

@bors 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
Copy link
Member Author

kennytm commented Feb 13, 2018

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

@kennytm kennytm closed this Feb 13, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.