Skip to content

Update rls - #47676

Merged
bors merged 1 commit into
rust-lang:masterfrom
topecongiro:update-rls
Jan 26, 2018
Merged

Update rls#47676
bors merged 1 commit into
rust-lang:masterfrom
topecongiro:update-rls

Conversation

@topecongiro

@topecongirotopecongiro commented Jan 23, 2018

Copy link
Copy Markdown
Contributor

Currently rls is missing from the latest nightly component. This PR brings it back.

@rust-highfive

rust-highfive commented Jan 23, 2018

Copy link
Copy Markdown
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm
kennytm previously requested changes Jan 23, 2018
View reviewed changes
Comment threadsrc/Cargo.lock Outdated

@kennytmkennytmJan 23, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you not upgrade env_logger, to avoid conflict with #47501 (which is currently blocked due to chrono 0.4.0 prevents compiler doc from being warning-free)?

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 23, 2018
@kennytm
kennytm dismissed their stale reviewJanuary 25, 2018 20:26

The env_logger change has been included in #47729, which will conflict with this PR. Please rebase on the latest master.

@alexcrichton

alexcrichton commented Jan 25, 2018

Copy link
Copy Markdown
Member

@bors: r+ p=1

Let's get the rls back in nightly!

@bors

bors commented Jan 25, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit e6e436b has been approved by alexcrichton

@bors

bors commented Jan 26, 2018

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@topecongiro

topecongiro commented Jan 26, 2018

Copy link
Copy Markdown
ContributorAuthor

Rebased on the latest master to resolve conflicts.

@sfackler

sfackler commented Jan 26, 2018

Copy link
Copy Markdown
Member

@bors r=alexcrichton p=1

@bors

bors commented Jan 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 8636d01 has been approved by alexcrichton

@bors

bors commented Jan 26, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8636d01 with merge 5669050...

bors added a commit that referenced this pull request Jan 26, 2018
@bors
Auto merge of#47676- topecongiro:update-rls, r=alexcrichton
5669050
Update rls
Currently rls is missing from the latest nightly component. This PR brings it back.
@bors

bors commented Jan 26, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 8636d01 into rust-lang:masterJan 26, 2018
kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 26, 2018
@kennytm-githubbot
📣 Toolstate changed byrust-lang/rust#47676!
18dd72b
Tested on commit rust-lang/rust@5669050.
🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
@borsbors mentioned this pull request Jan 26, 2018
Closed
@topecongiro
topecongiro deleted the update-rls branch January 26, 2018 07:01
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytmkennytmkennytm left review comments

Assignees

@aturonaturon

Labels

S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@topecongiro@rust-highfive@alexcrichton@bors@sfackler@kennytm@aturon