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 glutin to 0.21, winit to 0.19 #3690

Closed
wants to merge 7 commits into from
Closed

Conversation

@jplatte
Copy link
Contributor

jplatte commented Jul 2, 2019

Resolves #3612
Supersedes #3546


This change is Reviewable

@jplatte
Copy link
Contributor Author

jplatte commented Jul 2, 2019

Do I need to fix the duplicate dependencies (crossbeam etc) as reported by Taskcluster? That would make this PR a bit more complex (I don't know how much), but I'd be happy to look into updating them as well.

@atouchet
Copy link
Contributor

atouchet commented Jul 2, 2019

Do I need to fix the duplicate dependencies (crossbeam etc) as reported by Taskcluster? That would make this PR a bit more complex (I don't know how much), but I'd be happy to look into updating them as well.

I don't know if they'll care about those duplicates but for now you could add them to servo-tidy.toml.

@jplatte
Copy link
Contributor Author

jplatte commented Jul 3, 2019

Ah, thanks for pointing me to that file. It says that one of the files I touched is copied from glutin; I should probably copy over glutin 0.21's version of that file (or import the module if it is now public).

@bors-servo
Copy link
Contributor

bors-servo commented Jul 3, 2019

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

@jplatte
Copy link
Contributor Author

jplatte commented Jul 3, 2019

So I looked at that file and it's not as easy as copying egl.rs, it imports private items from glutin. I'll leave the file as it is until I get further feedback.

@jplatte
Copy link
Contributor Author

jplatte commented Jul 3, 2019

Rebased and put the duplicate deps in the ignore list in servo-tidy.toml

Like I said before, I'd be happy to investigate how to get rid of the duplicate dependencies instead, if that is preferred.

jplatte added 2 commits Jul 4, 2019
@kvark
Copy link
Member

kvark commented Jul 4, 2019

…lContext
@jplatte
Copy link
Contributor Author

jplatte commented Jul 4, 2019

@kvark: done

@kvark
Copy link
Member

kvark commented Jul 4, 2019

moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Jul 10, 2019
xeonchen pushed a commit to xeonchen/gecko that referenced this pull request Jul 10, 2019
@atouchet
Copy link
Contributor

atouchet commented Jul 11, 2019

This was merged in #3699. Thanks!

@atouchet atouchet closed this Jul 11, 2019
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 4, 2019
From servo/webrender#3690

Differential Revision: https://phabricator.services.mozilla.com/D36978

UltraBlame original commit: 87a8c6317e12e1f2a7daf4b08d9935f6f610e7d0
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 4, 2019
From servo/webrender#3690

Differential Revision: https://phabricator.services.mozilla.com/D36978

UltraBlame original commit: 87a8c6317e12e1f2a7daf4b08d9935f6f610e7d0
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 4, 2019
From servo/webrender#3690

Differential Revision: https://phabricator.services.mozilla.com/D36978

UltraBlame original commit: 87a8c6317e12e1f2a7daf4b08d9935f6f610e7d0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.