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 #49587

Merged
merged 1 commit into from
Apr 5, 2018
Merged

Update RLS #49587

merged 1 commit into from
Apr 5, 2018

Conversation

Bobo1239
Copy link
Contributor

@Bobo1239 Bobo1239 commented Apr 2, 2018

Includes rust-lang/rls#793 which fixes rust-lang/rls#803.

@Bobo1239 Bobo1239 mentioned this pull request Apr 2, 2018
Closed
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 2, 2018

📌 Commit d0a65f4 has been approved by nikomatsakis

@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 Apr 2, 2018
@bors
Copy link
Contributor

bors commented Apr 3, 2018

☔ The latest upstream changes (presumably #49590) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Apr 3, 2018
@Bobo1239
Copy link
Contributor Author

Bobo1239 commented Apr 3, 2018

Rebased.

@nrc
Copy link
Member

nrc commented Apr 4, 2018

@bors: r=nikomatsakis p=10

@bors
Copy link
Contributor

bors commented Apr 4, 2018

📌 Commit 858bae2 has been approved by nikomatsakis

@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 Apr 4, 2018
@bors
Copy link
Contributor

bors commented Apr 4, 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 Apr 4, 2018
@nrc
Copy link
Member

nrc commented Apr 4, 2018

ping @Bobo1239 bors thinks this needs rebasing (though GitHub disagrees, which is weird)

@Bobo1239
Copy link
Contributor Author

Bobo1239 commented Apr 4, 2018

Done. (also updated to latest commit)

@nrc
Copy link
Member

nrc commented Apr 4, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 4, 2018

📌 Commit ae86e83 has been approved by nrc

@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 Apr 4, 2018
@bors
Copy link
Contributor

bors commented Apr 5, 2018

⌛ Testing commit ae86e83 with merge 2c87632203d560d8495abb69e31ea4a847b31491...

@alexcrichton
Copy link
Member

@bors: retry

pushed to master, kicking bors

@bors
Copy link
Contributor

bors commented Apr 5, 2018

⌛ Testing commit ae86e83 with merge 3b1fa86...

bors added a commit that referenced this pull request Apr 5, 2018
@bors
Auto merge of #49587 - Bobo1239:master, r=nrc
3b1fa86 
Update RLS

Includes rust-lang/rls#793 which fixes rust-lang/rls#803.
@bors
Copy link
Contributor

bors commented Apr 5, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 3b1fa86 to master...

@bors bors merged commit ae86e83 into rust-lang:master Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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.

RLS and the compiler keep rebuilding after each other
5 participants
@Bobo1239 @nikomatsakis @bors @nrc @alexcrichton