Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Update nightly version and upgrade futures dep #904

Merged
merged 12 commits into from
Jan 24, 2019
Merged

Conversation

maackle
Copy link
Collaborator

@maackle maackle commented Jan 22, 2019

If we're ready to upgrade our nightly version (it's been almost a month), we can get off of the futures-preview fork. We've had a few issues come in with people running into the Pin::set discrepancy, probably because they are on more recent nightly versions.

@maackle maackle requested a review from zippy January 22, 2019 09:16
@maackle
Copy link
Collaborator Author

maackle commented Jan 22, 2019

This is now blocked by rust-lang/rust#57518. Anything after nightly-2019-01-08 segfaults when running in Nix. So looks like we can't upgrade yet without completely breaking CI, until this is fixed upstream.

@zippy
Copy link
Member

zippy commented Jan 22, 2019

well if the idea is just to get off the forked futures-preview, lets just change the build to 2019-01-08 no? We don't actually have to wait for the upstream problems to be fixed to solve that problem.

@zippy
Copy link
Member

zippy commented Jan 23, 2019

And actually I think the real issue here is that we aren't pinning all our version by committing cargo lock. Isn't it? I think its time we actually did that to solve the problem so we don't keep having this issue come back and bite us.

@zippy
Copy link
Member

zippy commented Jan 23, 2019

It seems like we all agree that the real problem is that things break because of upstream changes. Thus the latest commit that pins this back to 2018-12-26 and alpha.11, which works for CI. Note that to make this work I had to override the broken non-internally pinned dependencies in futures-previews to the sub-crates.

@maackle
Copy link
Collaborator Author

maackle commented Jan 23, 2019

@zippy this is nice in that we don't need a fork anymore, but it doesn't change anything else. Anyone who tries to use a more recent nightly will still see breaking changes, as in develop. The real fix is to to make sure people don't do that.

@zippy
Copy link
Member

zippy commented Jan 23, 2019

I don't think the moving forward of nightly is the problem. The code actually compiles on anything up to nightly 2019-01-08 with this change. It's not the advance of nightly that was the problem (except for because of the nix overlay issue) it was that the futures wasn't pinned. AND we tell people in the readme that they must use the pinned version of nightly and enforce that in both the Makefile and the nix shell, so that should be enough.

However I've still bumped to 2019-01-08 just to be moving things forward...

@lucksus
Copy link
Collaborator

lucksus commented Jan 24, 2019

@sphinxc0re, can you re-review?

Copy link
Member

@zippy zippy left a comment

Choose a reason for hiding this comment

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

kind of a cheatty approve since I added a bunch of the code here....

@zippy zippy merged commit 7601561 into develop Jan 24, 2019
@zippy zippy deleted the futures-preview-alpha-12 branch July 4, 2019 19:58
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.

5 participants