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

Allocate GL objects into Vecs, then slice for return #80

Merged
merged 1 commit into from Apr 24, 2014

Conversation

@robn
Copy link
Contributor

robn commented Apr 23, 2014

Since rust-lang/rust@7d3b0bf we can't do this with primitive vectors.

I might be describing this wrong. I only barely understand what's going on. But this gets it compiling again :)

@metajack
Copy link
Contributor

metajack commented Apr 24, 2014

@larsbergstrom Are we pulling in this version of Rust for the upgrade?

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 24, 2014

@metajack No, we're only picking up through rust-lang/rust@e263ef1 , which is ~14 days ago.

@robn
Copy link
Contributor Author

robn commented Apr 24, 2014

I guess what you're saying is that I should be running a release Rust, and not from git? I can do that! I grabbed git out of habit, not because I actually need anything in it :)

@metajack
Copy link
Contributor

metajack commented Apr 24, 2014

No, we didn't say anything yet. You should probably be running head, and I want to accept this PR, but we must put it on a branch. I'll create a 0.11-pre branch. Can you submit this PR to that branch once I've done so?

Alternatively we could keep master up to date with Rust master and create a branch for Servo. @larsbergstrom what do you think?

@metajack
Copy link
Contributor

metajack commented Apr 24, 2014

Sorry for this. Servo uses a non-release but not quite head version of Rust, so it makes managing some of our dependencies a little awkward.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 24, 2014

@metajack It seems like it would be more consistent across all of our submodules if we always had master on Rust master and the Servo branch on Servo's Rust. Then whether they're upstream or something we actually own, the process is still pretty similar.

@metajack
Copy link
Contributor

metajack commented Apr 24, 2014

@larsbergstrom Ok. Merging this then and we'll start working on servo branch for our Rust.

@robn Thanks for this patch!

metajack added a commit that referenced this pull request Apr 24, 2014
Allocate GL objects into Vecs, then slice for return
@metajack metajack merged commit 9adae97 into servo:master Apr 24, 2014
@robn
Copy link
Contributor Author

robn commented Apr 24, 2014

Thanks guys!

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.