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

Upgrade dependencies #1559

Merged
merged 1 commit into from
Oct 15, 2019
Merged

Upgrade dependencies #1559

merged 1 commit into from
Oct 15, 2019

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Sep 27, 2019

I had hard time upgrading lsp-types so it's left with old version.

@mati865 mati865 changed the title Update deps Upgrade dependencies Sep 27, 2019
@bors
Copy link
Contributor

bors commented Oct 1, 2019

☔ The latest upstream changes (presumably #1562) made this pull request unmergeable. Please resolve the merge conflicts.

@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2019

Huh, it's interesting that we still pulled in the rustc-serialize... Sorry for the conflict due to #1562, could you please rebase it?

@mati865
Copy link
Contributor Author

mati865 commented Oct 1, 2019

Huh, it's interesting that we still pulled in the rustc-serialize...

Noticed it while checking Rust's Cargo.lock 😃

Sorry for the conflict due to #1562, could you please rebase it?

No problem.

@bors
Copy link
Contributor

bors commented Oct 11, 2019

☔ The latest upstream changes (presumably #1563) made this pull request unmergeable. Please resolve the merge conflicts.

@mati865
Copy link
Contributor Author

mati865 commented Oct 11, 2019

Travis Linux build is still the only CI that passes tests.

@Xanewok Xanewok merged commit fb9aa9f into rust-lang:master Oct 15, 2019
@Xanewok
Copy link
Member

Xanewok commented Oct 15, 2019

Thanks and sorry for waiting! This only needs resolving the recent tooltip test breakage but that's let's do that separately.

@mati865 mati865 deleted the update-deps branch October 15, 2019 14:04
@mati865
Copy link
Contributor Author

mati865 commented Oct 15, 2019

sorry for waiting

No problem.

This only needs resolving the recent tooltip test breakage but that's let's do that separately.

I have no idea how to fix it but it has broken for two weeks.
lsp-types is out of date if somebody is brave enough to dive into it.

@Xanewok
Copy link
Member

Xanewok commented Oct 15, 2019

lsp-types is out of date if somebody is brave enough to dive into it.

That might be slightly more difficult than it sounds. We pinned the version because the extension relies on the older format of the progress messages, which (unfortunately?) changed in preparation for the official LSP release. The fix would be to extract them again to a local definition, as before, use them and continue to use the newer versionf of the lsp-types.

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.

3 participants