Skip to content

Update RLS#49587

Merged
bors merged 1 commit into
rust-lang:masterfrom
Bobo1239:master
Apr 5, 2018
Merged

Update RLS#49587
bors merged 1 commit into
rust-lang:masterfrom
Bobo1239:master

Conversation

@Bobo1239

@Bobo1239 Bobo1239 commented Apr 2, 2018

Copy link
Copy Markdown
Contributor

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 2, 2018

Copy link
Copy Markdown
Collaborator

📌 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

bors commented Apr 3, 2018

Copy link
Copy Markdown
Collaborator

☔ 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

Bobo1239 commented Apr 3, 2018

Copy link
Copy Markdown
Contributor Author

Rebased.

@nrc

nrc commented Apr 4, 2018

Copy link
Copy Markdown
Member

@bors: r=nikomatsakis p=10

@bors

bors commented Apr 4, 2018

Copy link
Copy Markdown
Collaborator

📌 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

bors commented Apr 4, 2018

Copy link
Copy Markdown
Collaborator

🔒 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

nrc commented Apr 4, 2018

Copy link
Copy Markdown
Member

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

@Bobo1239

Bobo1239 commented Apr 4, 2018

Copy link
Copy Markdown
Contributor Author

Done. (also updated to latest commit)

@nrc

nrc commented Apr 4, 2018

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Apr 4, 2018

Copy link
Copy Markdown
Collaborator

📌 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

bors commented Apr 5, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ae86e83 with merge 2c87632203d560d8495abb69e31ea4a847b31491...

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

pushed to master, kicking bors

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ae86e83 with merge 3b1fa86...

bors added a commit that referenced this pull request Apr 5, 2018
@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Collaborator

☀️ 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

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.

RLS and the compiler keep rebuilding after each other

5 participants