Skip to content

Update cargo/rls submodules and dependencies #42676

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jun 18, 2017

Conversation

alexcrichton
Copy link
Member

Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.

@rust-highfive
Copy link
Contributor

r? @aturon

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

@alexcrichton
Copy link
Member Author

This is a reopening of #42668 but with more updates

r? @Mark-Simulacrum

@alexcrichton alexcrichton added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2017
@Mark-Simulacrum
Copy link
Member

Looks good to me.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 15, 2017

📌 Commit 34abff9 has been approved by Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2017
@bors
Copy link
Collaborator

bors commented Jun 17, 2017

⌛ Testing commit 34abff9 with merge daf08a7...

@bors
Copy link
Collaborator

bors commented Jun 17, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member

[01:06:58] error[E0432]: unresolved import `cargo::core::MultiShell`
[01:06:58]   --> src\tools\rls\src\build.rs:19:30
[01:06:58]    |
[01:06:58] 19 | use cargo::core::{PackageId, MultiShell, Workspace};
[01:06:58]    |                              ^^^^^^^^^^ no `MultiShell` in `core`
[01:06:58]
[01:06:59] error: aborting due to previous error(s)

Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.
@Mark-Simulacrum Mark-Simulacrum 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 Jun 17, 2017
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jun 18, 2017

📌 Commit 1cede10 has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jun 18, 2017

⌛ Testing commit 1cede10 with merge 10d7cb4...

bors added a commit that referenced this pull request Jun 18, 2017
Update cargo/rls submodules and dependencies

Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.
@bors
Copy link
Collaborator

bors commented Jun 18, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 10d7cb4 to master...

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants