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.

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

Rollup of 8 pull requests #60651

Merged
merged 16 commits into from
May 9, 2019
Merged

Rollup of 8 pull requests #60651

merged 16 commits into from
May 9, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 8, 2019

Successful merges:

Failed merges:

r? @ghost

stepancheg and others added 16 commits May 5, 2019 23:07
... on different platforms.

Official rustdoc of
[`usize::to_le_bytes`](https://doc.rust-lang.org/std/primitive.usize.html#method.to_le_bytes)
displays signature

```
pub fn to_ne_bytes(self) -> [u8; 8]
```

which might be misleading: this function returns 4 bytes on 32-bit
systems.
It was fixed somewhere between 1.28.0 and 1.31.1

closes rust-lang#50518
Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
to_xe_bytes for isize and usize returns an array of different size

... on different platforms.

Official rustdoc of
[`usize::to_le_bytes`](https://doc.rust-lang.org/std/primitive.usize.html#method.to_le_bytes)
displays signature

```
pub fn to_ne_bytes(self) -> [u8; 8]
```

which might be misleading: this function returns 4 bytes on 32-bit
systems.

With this commit applied rustdoc for `isize` and `usize` is this:
<img width="740" alt="2019-04-15_0020" src="https://user-images.githubusercontent.com/28969/56100765-9f69b380-5f14-11e9-974c-daa25edaa881.png">
std: Update compiler-builtins crate

Pulls in a fix for ensuring that wasm targets have code in
compiler-builtins for `ldexp` which LLVM can generate references to.
…arkor

Add tests for concrete const types

In response to the request for help in rust-lang#44580 (comment), I have added several ui tests around the use of concrete const types, i.e. A<2>.

r? @varkor
test for rust-lang#50518

It was fixed somewhere between 1.28.0 and 1.31.1

closes rust-lang#50518

r? @estebank

Where's the best place to add this test? I *think* we want "compile-pass" for this test (no need to run a binary, and not running saves us a millisecond of process creation) , but there's no compile-pass anymore.

Should this be UI test with empty stdout, stderr and zero return code?
Document + Cleanup lang_items.rs

Byproduct of work on rust-lang#60607.

r? @oli-obk
Instead of ICEing on incorrect pattern, use delay_span_bug

Fix rust-lang#60635.
Use `delay_span_bug` for "Failed to unify obligation"

Fix rust-lang#60283.
@Centril
Copy link
Contributor Author

Centril commented May 8, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented May 8, 2019

📌 Commit f683b6b has been approved by Centril

@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 May 8, 2019
@bors
Copy link
Contributor

bors commented May 8, 2019

⌛ Testing commit f683b6b with merge 9f83961...

bors added a commit that referenced this pull request May 8, 2019
Rollup of 8 pull requests

Successful merges:

 - #59979 (to_xe_bytes for isize and usize returns an array of different size)
 - #60491 (std: Update compiler-builtins crate)
 - #60550 (Add tests for concrete const types)
 - #60572 (Add test for #59972)
 - #60627 (test for #50518)
 - #60634 (Document + Cleanup lang_items.rs)
 - #60641 (Instead of ICEing on incorrect pattern, use delay_span_bug)
 - #60644 (Use `delay_span_bug` for "Failed to unify obligation")

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 9, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 9f83961 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 9, 2019
@bors bors merged commit f683b6b into rust-lang:master May 9, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #60651!

Tested on commit 9f83961.
Direct link to PR: #60651

🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 9, 2019
Tested on commit rust-lang/rust@9f83961.
Direct link to PR: <rust-lang/rust#60651>

🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@Centril Centril deleted the rollup-zoamjfk branch May 9, 2019 03:14
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

9 participants