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

Update rls #47676

Merged
merged 1 commit into from
Jan 26, 2018
Merged

Update rls #47676

merged 1 commit into from
Jan 26, 2018

Conversation

topecongiro
Copy link
Contributor

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

@rust-highfive
Copy link
Collaborator

r? @aturon

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

src/Cargo.lock Outdated
@@ -265,6 +265,15 @@ name = "cfg-if"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "chrono"
version = "0.4.0"
Copy link
Member

@kennytm kennytm Jan 23, 2018

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)?

@kennytm kennytm 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 review January 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
Copy link
Member

@bors: r+ p=1

Let's get the rls back in nightly!

@bors
Copy link
Contributor

bors commented Jan 25, 2018

📌 Commit e6e436b has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 26, 2018

🔒 Merge conflict

@topecongiro
Copy link
Contributor Author

Rebased on the latest master to resolve conflicts.

@sfackler
Copy link
Member

@bors r=alexcrichton p=1

@bors
Copy link
Contributor

bors commented Jan 26, 2018

📌 Commit 8636d01 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 26, 2018

⌛ Testing commit 8636d01 with merge 5669050...

bors added a commit that referenced this pull request Jan 26, 2018
Update rls

Currently rls is missing from the latest nightly component. This PR brings it back.
@bors
Copy link
Contributor

bors commented Jan 26, 2018

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

@bors bors merged commit 8636d01 into rust-lang:master Jan 26, 2018
kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 26, 2018
Tested on commit rust-lang/rust@5669050.

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
@topecongiro topecongiro deleted the update-rls branch January 26, 2018 07:01
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.

7 participants