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

Fix some of the rustfmt fallout in Miri #68288

Merged
merged 3 commits into from
Jan 17, 2020
Merged

Fix some of the rustfmt fallout in Miri #68288

merged 3 commits into from
Jan 17, 2020

Conversation

RalfJung
Copy link
Member

re-post of #67833 without the rustfmt::skip

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Jan 16, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 16, 2020

📌 Commit c781d15 has been approved by oli-obk

@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 Jan 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 17, 2020
Fix some of the rustfmt fallout in Miri

re-post of rust-lang#67833 without the `rustfmt::skip`

r? @oli-obk
bors added a commit that referenced this pull request Jan 17, 2020
Rollup of 6 pull requests

Successful merges:

 - #67956 (Detail transitive containment in E0588 diagnostic)
 - #68153 (resolve: Point at the private item definitions in privacy errors)
 - #68195 (Account for common `impl Trait`/`dyn Trait` return type errors)
 - #68288 (Fix some of the rustfmt fallout in Miri)
 - #68292 (don't clone types that are copy)
 - #68301 (Don't propagate __RUST_TEST_INVOKE to subprocess)

Failed merges:

r? @ghost
@bors bors merged commit c781d15 into rust-lang:master Jan 17, 2020
@RalfJung RalfJung deleted the fmt branch February 2, 2020 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants