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

Update RLS #49014

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Update RLS #49014

merged 1 commit into from
Mar 14, 2018

Conversation

Bobo1239
Copy link
Contributor

r? @alexcrichton
Includes rust-lang/rls#762 which should fix the build.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

@bors: r+ p=5

@bors
Copy link
Contributor

bors commented Mar 14, 2018

📌 Commit 4de8708 has been approved by alexcrichton

@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 Mar 14, 2018
@kennytm
Copy link
Member

kennytm commented Mar 14, 2018

@bors p=25

Let's fix RLS before merging the rollup.

@bors
Copy link
Contributor

bors commented Mar 14, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 14, 2018
@Bobo1239
Copy link
Contributor Author

Rebased and passes tests locally.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 14, 2018

📌 Commit c214802 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2018
@bors
Copy link
Contributor

bors commented Mar 14, 2018

⌛ Testing commit c214802 with merge e96e54d...

bors added a commit that referenced this pull request Mar 14, 2018
@bors
Auto merge of #49014 - Bobo1239:master, r=alexcrichton
e96e54d 
Update RLS

r? @alexcrichton
Includes rust-lang/rls#762 which should fix the build.
@bors
Copy link
Contributor

bors commented Mar 14, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing e96e54d to master...

@bors bors merged commit c214802 into rust-lang:master Mar 14, 2018
@kennytm-githubbot
Copy link

📣 Toolstate changed by #49014!

Tested on commit e96e54d.
Direct link to PR: #49014

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 14, 2018
@kennytm-githubbot
📣 Toolstate changed by rust-lang/rust#49014!
924d996 
Tested on commit rust-lang/rust@e96e54d.
Direct link to PR: <rust-lang/rust#49014>

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
@bors bors mentioned this pull request Mar 14, 2018
Merged
@mati865 mati865 mentioned this pull request Mar 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
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.
6 participants
@Bobo1239 @rust-highfive @alexcrichton @bors @kennytm @kennytm-githubbot