Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

ollie27 and others added 10 commits January 8, 2020 22:56
These shims are only needed on 32-bit x86. Additionally since https://reviews.llvm.org/rL268875 LLVM handles adding the shims itself for the intrinsics.
* Use `black_box` to avoid memory leak removal during optimization.
* Leak multiple objects to make test case more robust.
The condition
if obligation.recursion_depth >= 0
is always true since recursion_depth is usize.

The else branch is dead code and can be removed.

Found by Clippy.

Fixes rust-lang#68251
Don't use f64 shims for f32 cmath functions on non 32-bit x86 MSVC

These shims are only needed on 32-bit x86. Additionally since https://reviews.llvm.org/rL268875 LLVM handles adding the shims itself for the intrinsics.
Enable leak sanitizer test case

* Use `black_box` to avoid memory leak removal during optimization.
* Leak multiple objects to make test case more robust.
Remove unused auxiliary file that was replaced with rust_test_helpers
…light_escape, r=GuillaumeGomez

rustdoc: HTML escape codeblocks which fail syntax highlighting

r? @GuillaumeGomez
remove dead code

The condition
`if obligation.recursion_depth >= 0`
is always true since `recursion_depth` is `usize`.

The else branch is dead code and can be removed.

Found by Clippy.

Fixes rust-lang#68251
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 16, 2020
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 16, 2020

📌 Commit a529e70 has been approved by Dylan-DPC

@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 Jan 16, 2020
@bors
Copy link
Collaborator

bors commented Jan 16, 2020

⌛ Testing commit a529e70 with merge 4884061...

bors added a commit that referenced this pull request Jan 16, 2020
Rollup of 5 pull requests

Successful merges:

 - #68033 (Don't use f64 shims for f32 cmath functions on non 32-bit x86 MSVC)
 - #68244 (Enable leak sanitizer test case)
 - #68255 (Remove unused auxiliary file that was replaced with rust_test_helpers)
 - #68263 (rustdoc: HTML escape codeblocks which fail syntax highlighting)
 - #68274 (remove dead code)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jan 16, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 4884061 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 16, 2020
@bors bors merged commit a529e70 into rust-lang:master Jan 16, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-x7ssgov branch January 17, 2020 05:44
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.

6 participants