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 3 pull requests #3544

Merged
merged 6 commits into from
Dec 12, 2018
Merged

Rollup of 3 pull requests #3544

merged 6 commits into from
Dec 12, 2018

Conversation

flip1995
Copy link
Member

phansch and others added 6 commits December 12, 2018 08:21
fix ui test cast_alignment failure by adding #![feature(rustc_private)]
Fix rvm/gpg bug in travis osx build

Apparently this workaround isn't needed anymore ([travis](https://travis-ci.org/flip1995/rust-clippy/jobs/467027571)) and fixes the latest osx failures: [travis](https://travis-ci.org/rust-lang/rust-clippy/jobs/467013498#L152)
rustup rust-lang/rust#56092

fix ui test cast_alignment failure by adding #![feature(rustc_private)]
@flip1995
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit b7a431e has been approved by flip1995

bors added a commit that referenced this pull request Dec 12, 2018
Rollup of 3 pull requests

Successful merges:

 - #3509 (Fix doc_markdown off by one issue)
 - #3539 (Fix rvm/gpg bug in travis osx build)
 - #3540 (rustup rust-lang/rust#56092)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 12, 2018

⌛ Testing commit b7a431e with merge 2f467ac...

@bors
Copy link
Contributor

bors commented Dec 12, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: flip1995
Pushing 2f467ac to master...

@bors bors merged commit b7a431e into rust-lang:master Dec 12, 2018
@flip1995 flip1995 deleted the rollup branch December 12, 2018 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants