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

rename panic_if_ intrinsics to assert_ #69954

Merged
merged 2 commits into from
Mar 13, 2020
Merged

rename panic_if_ intrinsics to assert_ #69954

merged 2 commits into from
Mar 13, 2020

Conversation

RalfJung
Copy link
Member

@rust-highfive
Copy link
Collaborator

r? @cramertj

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 12, 2020
@cramertj
Copy link
Member

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned cramertj Mar 12, 2020
@Centril
Copy link
Contributor

Centril commented Mar 12, 2020

r? @Centril @bors r+

@bors
Copy link
Contributor

bors commented Mar 12, 2020

📌 Commit f32cccc has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Mar 12, 2020
@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 Mar 12, 2020
@RalfJung RalfJung added the A-miri Area: The miri tool label Mar 13, 2020
@RalfJung
Copy link
Member Author

Renamed enum.
@bors r=Centril,eddyb

@bors
Copy link
Contributor

bors commented Mar 13, 2020

📌 Commit f61fb53 has been approved by Centril,eddyb

@pietroalbini
Copy link
Member

Had to cancel the CI build to get the whole CI unstuck, sorry for the trouble.

Centril added a commit to Centril/rust that referenced this pull request Mar 13, 2020
@Centril
Rollup merge of rust-lang#69954 - RalfJung:panic_if-assert, r=Centril…
11ddf3a 
…,eddyb

rename panic_if_ intrinsics to assert_

[Suggested by @eddyb](rust-lang/miri#1222 (comment))
@Centril Centril mentioned this pull request Mar 13, 2020
Closed
@RalfJung RalfJung closed this Mar 13, 2020
@RalfJung RalfJung reopened this Mar 13, 2020
@JohnTitor JohnTitor mentioned this pull request Mar 13, 2020
Merged
bors added a commit that referenced this pull request Mar 13, 2020
@bors
Auto merge of #69986 - JohnTitor:rollup-h0809mf, r=JohnTitor
1572c43 
Rollup of 12 pull requests

Successful merges:

 - #69403 (Implement `Copy` for `IoSlice`)
 - #69460 (Move some `build-pass` tests to `check-pass`)
 - #69723 (Added doc on keyword Pub.)
 - #69802 (fix more clippy findings)
 - #69809 (remove lifetimes that can be elided (clippy::needless_lifetimes))
 - #69947 (Clean up E0423 explanation)
 - #69949 (triagebot.toml: add ping aliases)
 - #69954 (rename panic_if_ intrinsics to assert_)
 - #69960 (miri engine: fix treatment of abort intrinsic)
 - #69966 (Add more regression tests)
 - #69973 (Update stable-since version for const_int_conversion)
 - #69974 (Clean up E0434 explanation)

Failed merges:

r? @ghost
@bors bors merged commit 77263db into rust-lang:master Mar 13, 2020
@RalfJung RalfJung deleted the panic_if-assert branch March 14, 2020 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees

@Centril Centril

Labels
A-miri Area: The miri tool 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.

None yet
7 participants
@RalfJung @rust-highfive @cramertj @Centril @bors @pietroalbini @eddyb