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

Rustup #3945

Merged
merged 1 commit into from
Apr 12, 2019
Merged

Rustup #3945

merged 1 commit into from
Apr 12, 2019

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Apr 12, 2019

cc rust-lang/rust#59227 (comment)

This fix is obsolet once rust-lang/rust#59779 and #3926 is merged.

This fix is obsolet once rust-lang/rust#59779 and rust-lang#3926 is merged.
@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Apr 12, 2019
@phansch
Copy link
Member

phansch commented Apr 12, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 12, 2019

📌 Commit 3fe5eea has been approved by phansch

@bors
Copy link
Contributor

bors commented Apr 12, 2019

⌛ Testing commit 3fe5eea with merge abf7f91...

@bors
Copy link
Contributor

bors commented Apr 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing abf7f91 to master...

@bors bors merged commit 3fe5eea into rust-lang:master Apr 12, 2019
@Xanewok
Copy link
Member

Xanewok commented Apr 12, 2019

If you're going to create submodule update PR, please also update the RLS submodule to the newest master! (Fixes formatting, if not, I'll be be submitting a PR myself)

@mati865
Copy link
Contributor

mati865 commented Apr 12, 2019

Miri could be updated as well.

@flip1995 flip1995 deleted the rustup branch April 12, 2019 13:38
@flip1995
Copy link
Member Author

If you're going to create submodule update PR

Should we wait for rust-lang/rls#1424 to be merged before creating a submodule update?

@mati865
Copy link
Contributor

mati865 commented Apr 12, 2019

@flip1995 Rust patches dependencies to use Clippy from submodule so it doesn't matter.

@Xanewok
Copy link
Member

Xanewok commented Apr 12, 2019

It doesn't, but please include rust-lang/rls@40778f5 as well as part of the submodule update

@flip1995
Copy link
Member Author

Done: rust-lang/rust#59916

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants