Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Update cargo #635

Merged
merged 3 commits into from
Dec 22, 2017
Merged

Update cargo #635

merged 3 commits into from
Dec 22, 2017

Conversation

alexcrichton
Copy link
Member

This PR has a few commits which culminates in the ability to upgrade Cargo in the main repo, accounting for recent changes in Cargo particularly around how the cwd is handled.

Pulls in a few changes to get rls working with master `cargo` again. This also
updates the RLS to the point that it compiles again, but it's not quite passing
tests yet.
Right now there's a lock around setting global things like env vars, so add
handling of the cwd to this and manage requests from Cargo to change the cwd as
well.
Now that this can change while the rls is running any access needs to be
arbitrated through the environment lock or the variable needs to be passed in
@nrc nrc merged commit f44b74d into rust-lang:master Dec 22, 2017
@nrc
Copy link
Member

nrc commented Dec 22, 2017

The test failures are an unrelated rustfmt issue.

Thanks Alex!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants