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

Rust 1.17.0 #1417

Merged
merged 4 commits into from Jun 22, 2017
Merged

Rust 1.17.0 #1417

merged 4 commits into from Jun 22, 2017

Conversation

@rillian
Copy link
Contributor

rillian commented Jun 22, 2017

Gecko bumped the minimum, so do the same here.


This change is Reviewable

Update the minimum language version we test against to match
Gecko. https://bugzilla.mozilla.org/show_bug.cgi?id=1374807
@kvark
kvark approved these changes Jun 22, 2017
@kvark
Copy link
Member

kvark commented Jun 22, 2017

Travis fails to -lGL for some reason...
AppVeyor fails to compile src/perf.rs, the errors are related to 'static elision

@rillian
Copy link
Contributor Author

rillian commented Jun 22, 2017

Thanks, I'll look at the test failures tomorrow.

rillian added 2 commits Jun 22, 2017
Rust 1.17.0 and later will infer this for us.
Rust 1.17.0 and later allow simplifying struct initialization.
@rillian rillian force-pushed the rillian:rust-1.17.0 branch from 2caaa3b to 17fdf3c Jun 22, 2017
@rillian
Copy link
Contributor Author

rillian commented Jun 22, 2017

The 'static elision failure was just a typo: s/str/&str/. I've pushed a fix.

I'm not sure why this worked before, but the travis CI runs
are failing on linux because the linker can't find a libGL.
Perhaps the library was removed from the base image in the
recent update.
@rillian
Copy link
Contributor Author

rillian commented Jun 22, 2017

For the GL issue, I was able to fix it by installing libGL instead of libGLESv2, since that's what the build was expecting to link to. Maybe it's bitrot. It's also possible that we should be testing against libGLES and either the library name or sys crate's expectations changed under us, in which case this is the wrong fix, so please review carefully.

If anyone else wants to debug, I was able to reproduce on master in an ubuntu:trusty docker container:

apt-get update && apt-get -y upgrade
apt-get -y install git build-essential curl
apt-get -y install cmake pkg-config libfreetype6-dev libx11-dev libexpat1-dev
apt-get -y install libgles2-mesa-dev llvm-3.8-dev libedit-dev
adduser --disabled-password build
su - build
curl https://sh.rustup.rs -sSf | sh
source ~/.cargo/env
git clone https://github.com/servo/webrender
cd webrender/webrender && cargo test --all --verbose
@kvark
Copy link
Member

kvark commented Jun 22, 2017

Thanks for fixing the CI!
@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

📌 Commit 8e502c8 has been approved by kvark

@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

Testing commit 8e502c8 with merge 951e3d0...

bors-servo added a commit that referenced this pull request Jun 22, 2017
Rust 1.17.0

Gecko [bumped the minimum](https://bugzilla.mozilla.org/show_bug.cgi?id=1374807#c12), so do the same here.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1417)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

☀️ Test successful - status-travis
Approved by: kvark
Pushing 951e3d0 to master...

@bors-servo bors-servo merged commit 8e502c8 into servo:master Jun 22, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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.

None yet

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