diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-04-16 04:10:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 04:10:27 -0400 |
commit | 1c9bbce38c51c5226f407f456f29136b78d60807 (patch) | |
tree | b74ae8bb0e827de811570ea8d120951d18eb98bd /components/script/stylesheet_loader.rs | |
parent | 1fe0f32059270e2d3e42b7c7184c2adf56f3f872 (diff) | |
parent | 7dbc524207059cec07761d6d71153432a3b749a7 (diff) | |
download | servo-1c9bbce38c51c5226f407f456f29136b78d60807.tar.gz servo-1c9bbce38c51c5226f407f456f29136b78d60807.zip |
Auto merge of #20641 - servo:alloc, r=nox
Fork the jemallocator crate, fix for nightly-2018-04-15
CC https://github.com/alexcrichton/jemallocator/pull/40, https://github.com/rust-lang/rust/pull/49669
The new version of jemallocator requires a more recent jemalloc https://github.com/alexcrichton/jemallocator/pull/34 which doesn’t build on our current Android toolchain https://github.com/jemalloc/jemalloc/issues/1175.
To avoid blocking on figuring that out, duplicate ~70 lines from jemallocator and use the older jemalloc-sys directly.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20641)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/stylesheet_loader.rs')
0 files changed, 0 insertions, 0 deletions