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 5 pull requests #70960

Merged
merged 11 commits into from
Apr 9, 2020
Merged

Rollup of 5 pull requests #70960

merged 11 commits into from
Apr 9, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 9, 2020

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 11 commits April 7, 2020 20:23
@RalfJung
bump Miri
203accc
@ehuss
Update cargo
ff26849
@flip1995
Update Clippy
70d9f9e
@varkor
Add regression test for rust-lang#66596
61cc892
@varkor
Add regression test for rust-lang#61522
0f02522
@Amanieu
Disable try_reserve tests on Android
7060a9e
@Centril
Rollup merge of rust-lang#70897 - RalfJung:miri, r=RalfJung
eecfd19 
bump Miri

r? @ghost Cc @rust-lang/miri

Fixes rust-lang#70894
@Centril
Rollup merge of rust-lang#70900 - ehuss:update-cargo, r=ehuss
15a7ad2 
Update cargo

4 commits in 6e07d2dfb7fc87b1c9489de41da4dafa239daf03..390e8f245ef2cd7ac698b8a76abf029f9abcab0d
2020-03-31 03:22:39 +0000 to 2020-04-07 17:46:45 +0000
- Compatibility for rust-lang#69926 (rust-lang/cargo#8080)
- Add note about converting triple case in environment variables (rust-lang/cargo#8079)
- Add support for `-Cembed-bitcode=no` (rust-lang/cargo#8066)
- Add triagebot configuration (rust-lang/cargo#8059)
@Centril
Rollup merge of rust-lang#70902 - flip1995:clippyup, r=eddyb
cb68d6e 
Update Clippy

Closes rust-lang#70875
@Centril
Rollup merge of rust-lang#70939 - varkor:const-generics-regression-te…
7944f39 
…sts, r=Centril

Add two const generics regression tests

Closes rust-lang#66596.
Closes rust-lang#61522.
@Centril
Rollup merge of rust-lang#70958 - Amanieu:android_try_reserve, r=Mark…
2c3147f 
…-Simulacrum

Disable try_reserve tests on Android

Calling `realloc` with large sizes seems to be broken on older Android versions that use dlmalloc as the default allocator. This is not an issue for modern Android versions that use jemalloc.

Fixes rust-lang#55861
@Centril
Copy link
Contributor Author

Centril commented Apr 9, 2020

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Apr 9, 2020

📌 Commit 2c3147f has been approved by Centril

@bors
Copy link
Contributor

bors commented Apr 9, 2020

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

@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 Apr 9, 2020
@Centril Centril added the rollup A PR which is a rollup label Apr 9, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 9, 2020

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Apr 9, 2020

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Apr 9, 2020

📌 Commit 2c3147f has been approved by Centril

@bors
Copy link
Contributor

bors commented Apr 9, 2020

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

@bors
Copy link
Contributor

bors commented Apr 9, 2020

⌛ Testing commit 2c3147f with merge cff82ecdc8199c96ac6190c3eaacc1dd617d072e...

@bors
Copy link
Contributor

bors commented Apr 9, 2020

💔 Test failed - checks-azure

@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 Apr 9, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 9, 2020

@bors retry spurious

@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 Apr 9, 2020
@bors
Copy link
Contributor

bors commented Apr 9, 2020

⌛ Testing commit 2c3147f with merge 94d3463...

@bors
Copy link
Contributor

bors commented Apr 9, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 94d3463 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2020
@bors bors merged commit 94d3463 into rust-lang:master Apr 9, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #70960!

Tested on commit 94d3463.
Direct link to PR: #70960

🎉 clippy-driver on windows: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
🎉 clippy-driver on linux: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 9, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#70960!
1da983c 
Tested on commit rust-lang/rust@94d3463.
Direct link to PR: <rust-lang/rust#70960>

🎉 clippy-driver on windows: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
🎉 clippy-driver on linux: build-fail → test-pass (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@Centril Centril deleted the rollup-9vmokvw branch April 10, 2020 09:27
@SNCPlay42 SNCPlay42 mentioned this pull request Apr 22, 2021
Closed
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
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Centril @bors @rust-highfive @RalfJung @ehuss @flip1995 @varkor @Amanieu